Hi all,
I said:
> News: there will be no linux-next releases until at least Dec 24 and,
> more likely, Dec 29. Have a Merry Christmas and take a break. :-)
Well, I decided I had time for one more so it will be based in -rc1).
This one has not had the build testing *between* merges, but has had all
the normal build testing at the end. Since the latter testing showed no
problems, this just means that there may be more unbisectable points in
the tree (but that is unlikely).
Changes since 20091218:
The mips tree lost its conflicts.
The rr tree lost its conflicts and merge fixup.
The backlight tree lost its conflicts.
The drm tree lost its conflict.
The fsnotify tree lost its build failure and it conflicts.
The limits tree gained a conflict against Linus' tree.
The tip tree gained a conflict against the limits tree.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
(patches at http://www.kernel.org/pub/linux/kernel/v2.6/next/ ). If you
are tracking the linux-next tree using git, you should not use "git pull"
to do so as that will try to merge the new linux-next release with the
old one. You should use "git fetch" as mentioned in the FAQ on the wiki
(see below).
You can see which trees have been included by looking in the Next/Trees
file in the source. There are also quilt-import.log and merge.log files
in the Next directory. Between each merge, the tree was built with
a ppc64_defconfig for powerpc and an allmodconfig for x86_64. After the
final fixups (if any), it is also built with powerpc allnoconfig (32 and
64 bit), ppc44x_defconfig and allyesconfig (minus
CONFIG_PROFILE_ALL_BRANCHES - this fails its final link) and i386, sparc
and sparc64 defconfig. These builds also have
CONFIG_ENABLE_WARN_DEPRECATED, CONFIG_ENABLE_MUST_CHECK and
CONFIG_DEBUG_INFO disabled when necessary.
Below is a summary of the state of the merge.
We are up to 155 trees (counting Linus' and 22 trees of patches pending
for Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.
Status of my local build tests will be at
http://kisskb.ellerman.id.au/linux-next . If maintainers want to give
advice about cross compilers/configs that work, we are always open to add
more builds.
Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.
There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel.
--
Cheers,
Stephen Rothwell [email protected]
$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/for-linus
Merging quilt/driver-core.current
Merging quilt/tty.current
Merging quilt/usb.current
Merging quilt/staging.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging ide-curent/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/davinci-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
Merging mips/mips-for-linux-next
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
Merging ext3/for_next
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging logfs/master
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/file.c
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
CONFLICT (add/add): Merge conflict in fs/9p/cache.c
Merging ubifs/linux-next
Merging xfs/master
CONFLICT (add/add): Merge conflict in fs/xfs/linux-2.6/xfs_trace.h
CONFLICT (content): Merge conflict in include/linux/fs.h
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-1394.c
CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv-avc.c
CONFLICT (add/add): Merge conflict in drivers/media/dvb/firewire/firedtv-fw.c
CONFLICT (content): Merge conflict in drivers/media/dvb/firewire/firedtv.h
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging tmio-mmc/linux-next
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging limits/writable_limits
CONFLICT (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
CONFLICT (content): Merge conflict in fs/exec.c
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in include/linux/sched.h
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
On Sat, 19 Dec 2009 11:04:57 +1100 Stephen Rothwell wrote:
> Hi all,
>
> I said:
> > News: there will be no linux-next releases until at least Dec 24 and,
> > more likely, Dec 29. Have a Merry Christmas and take a break. :-)
>
> Well, I decided I had time for one more so it will be based in -rc1).
>
> This one has not had the build testing *between* merges, but has had all
> the normal build testing at the end. Since the latter testing showed no
> problems, this just means that there may be more unbisectable points in
> the tree (but that is unlikely).
When CONFIG_DT3155=y (i.e., not a loadable module):
(a)
drivers/staging/dt3155/dt3155_drv.c:967: error: implicit declaration of function 'pci_find_device'
drivers/staging/dt3155/dt3155_drv.c:1151: error: implicit declaration of function 'request_irq'
drivers/staging/dt3155/dt3155_drv.c:1152: error: 'IRQF_SHARED' undeclared (first use in this function)
drivers/staging/dt3155/dt3155_drv.c:1152: error: 'IRQF_DISABLED' undeclared (first use in this function)
drivers/staging/dt3155/dt3155_drv.c:1195: error: implicit declaration of function 'free_irq'
#ifdef MODULE
#include <linux/interrupt.h>
linux/interrupt.h is needed for DT3155=y, not just when DT3155=m.
Oh, and this config has: # CONFIG_PCI_LEGACY is not set
which accounts for pci_find_device() being unknown.
If that is required (as it is currently, even though this function is
deprecated), it can be expressed in the driver's Kconfig file:
depends on PCI_LEGACY
(b) when compiling goes further:
drivers/staging/dt3155/dt3155_drv.c:571: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
drivers/staging/dt3155/dt3155_drv.c:571: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
drivers/staging/dt3155/dt3155_drv.c:657: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
drivers/staging/dt3155/dt3155_drv.c:657: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
General:
#ifndef CONFIG_PCI
#error "DT3155 : Kernel PCI support not enabled (DT3155 drive requires PCI)"
#endif
That should be handled via Kconfig, not in a .c file.
Ah, it is done in Kconfig, so those lines above (in .c file) can be deleted.
---
~Randy
On Sat, 19 Dec 2009 11:04:57 +1100 Stephen Rothwell wrote:
> Hi all,
>
> I said:
> > News: there will be no linux-next releases until at least Dec 24 and,
> > more likely, Dec 29. Have a Merry Christmas and take a break. :-)
>
> Well, I decided I had time for one more so it will be based in -rc1).
>
> This one has not had the build testing *between* merges, but has had all
> the normal build testing at the end. Since the latter testing showed no
> problems, this just means that there may be more unbisectable points in
> the tree (but that is unlikely).
ERROR: "ir_input_register" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
ERROR: "ir_input_unregister" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
ERROR: "ir_input_init" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
ERROR: "input_free_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
ERROR: "input_allocate_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
CONFIG_INPUT=n
---
~Randy
On Fri, Dec 18, 2009 at 07:10:37PM -0800, Randy Dunlap wrote:
> On Sat, 19 Dec 2009 11:04:57 +1100 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > I said:
> > > News: there will be no linux-next releases until at least Dec 24 and,
> > > more likely, Dec 29. Have a Merry Christmas and take a break. :-)
> >
> > Well, I decided I had time for one more so it will be based in -rc1).
> >
> > This one has not had the build testing *between* merges, but has had all
> > the normal build testing at the end. Since the latter testing showed no
> > problems, this just means that there may be more unbisectable points in
> > the tree (but that is unlikely).
>
>
> When CONFIG_DT3155=y (i.e., not a loadable module):
Ick, I'll change that to 'M' now, it shouldn't be built in just yet for
the reasons you found.
I don't think the code has ever been built as 'y' as you just found out.
>
> (a)
> drivers/staging/dt3155/dt3155_drv.c:967: error: implicit declaration of function 'pci_find_device'
> drivers/staging/dt3155/dt3155_drv.c:1151: error: implicit declaration of function 'request_irq'
> drivers/staging/dt3155/dt3155_drv.c:1152: error: 'IRQF_SHARED' undeclared (first use in this function)
> drivers/staging/dt3155/dt3155_drv.c:1152: error: 'IRQF_DISABLED' undeclared (first use in this function)
> drivers/staging/dt3155/dt3155_drv.c:1195: error: implicit declaration of function 'free_irq'
>
>
> #ifdef MODULE
> #include <linux/interrupt.h>
>
> linux/interrupt.h is needed for DT3155=y, not just when DT3155=m.
>
> Oh, and this config has: # CONFIG_PCI_LEGACY is not set
> which accounts for pci_find_device() being unknown.
> If that is required (as it is currently, even though this function is
> deprecated), it can be expressed in the driver's Kconfig file:
> depends on PCI_LEGACY
>
I'll fix this up to just not need this anymore, as it should be fixed.
> (b) when compiling goes further:
>
> drivers/staging/dt3155/dt3155_drv.c:571: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
> drivers/staging/dt3155/dt3155_drv.c:571: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
> drivers/staging/dt3155/dt3155_drv.c:657: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
> drivers/staging/dt3155/dt3155_drv.c:657: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
>
>
>
> General:
>
> #ifndef CONFIG_PCI
> #error "DT3155 : Kernel PCI support not enabled (DT3155 drive requires PCI)"
> #endif
>
> That should be handled via Kconfig, not in a .c file.
> Ah, it is done in Kconfig, so those lines above (in .c file) can be deleted.
Yes, lots of stuff in the .c file can be deleted :)
thanks,
greg k-h
On Sat, Dec 19, 2009 at 01:04, Stephen Rothwell <[email protected]> wrote:
> I said:
>> News: there will be no linux-next releases until at least Dec 24 and,
>> more likely, Dec 29. Have a Merry Christmas and take a break. :-)
>
> Well, I decided I had time for one more so it will be based in -rc1).
Hurray!
But http://kisskb.ellerman.id.au/kisskb/buildresult/1852835/ shows
linux-next/m68k-allmodconfig fails
in security/keys/keyctl.c, while this got fixed in 2.6.33-rc1?? It
compiled fine in linus/m68k-allmodconfig,
as expected
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected]
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
On Sat, Dec 19, 2009 at 7:18 AM, Randy Dunlap <[email protected]> wrote:
> On Sat, 19 Dec 2009 11:04:57 +1100 Stephen Rothwell wrote:
>
>> Hi all,
>>
>> I said:
>> > News: ?there will be no linux-next releases until at least Dec 24 and,
>> > more likely, Dec 29. ?Have a Merry Christmas and take a break. ?:-)
>>
>> Well, I decided I had time for one more so it will be based in -rc1).
>>
>> This one has not had the build testing *between* merges, but has had all
>> the normal build testing at the end. ?Since the latter testing showed no
>> problems, this just means that there may be more unbisectable points in
>> the tree (but that is unlikely).
>
>
>
> ERROR: "ir_input_register" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> ERROR: "ir_input_unregister" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> ERROR: "ir_input_init" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> ERROR: "input_free_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> ERROR: "input_allocate_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
>
>
>
> CONFIG_INPUT=n
Attached patch to fix the issue.
Fix Input dependency for Mantis
From: Manu Abraham <[email protected]>
Signed-off-by: Manu Abraham <[email protected]>
Regards,
Manu
On Sat, 19 Dec 2009 21:11:50 +0400 Manu Abraham wrote:
> On Sat, Dec 19, 2009 at 7:18 AM, Randy Dunlap <[email protected]> wrote:
> > On Sat, 19 Dec 2009 11:04:57 +1100 Stephen Rothwell wrote:
> >
> >> Hi all,
> >>
> >> I said:
> >> > News: ?there will be no linux-next releases until at least Dec 24 and,
> >> > more likely, Dec 29. ?Have a Merry Christmas and take a break. ?:-)
> >>
> >> Well, I decided I had time for one more so it will be based in -rc1).
> >>
> >> This one has not had the build testing *between* merges, but has had all
> >> the normal build testing at the end. ?Since the latter testing showed no
> >> problems, this just means that there may be more unbisectable points in
> >> the tree (but that is unlikely).
> >
> >
> >
> > ERROR: "ir_input_register" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> > ERROR: "ir_input_unregister" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> > ERROR: "ir_input_init" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> > ERROR: "input_free_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> > ERROR: "input_allocate_device" [drivers/media/dvb/mantis/mantis_core.ko] undefined!
> >
> >
> >
> > CONFIG_INPUT=n
>
> Attached patch to fix the issue.
>
> Fix Input dependency for Mantis
>
> From: Manu Abraham <[email protected]>
> Signed-off-by: Manu Abraham <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Thanks.
---
~Randy
Hi Geert,
On Sat, 19 Dec 2009 09:42:19 +0100 Geert Uytterhoeven <[email protected]> wrote:
>
> On Sat, Dec 19, 2009 at 01:04, Stephen Rothwell <[email protected]> wrote:
> >
> > Well, I decided I had time for one more so it will be based in -rc1).
>
> Hurray!
:-)
> But http://kisskb.ellerman.id.au/kisskb/buildresult/1852835/ shows
> linux-next/m68k-allmodconfig fails
> in security/keys/keyctl.c, while this got fixed in 2.6.33-rc1?? It
> compiled fine in linus/m68k-allmodconfig,
> as expected
That build was of next-20091218 ... the build of next-20091219
(http://kisskb.ellerman.id.au/kisskb/buildresult/1853405/) failed
differently :-(
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Fri, 18 Dec 2009 20:47:47 -0800 Greg KH wrote:
> On Fri, Dec 18, 2009 at 07:10:37PM -0800, Randy Dunlap wrote:
> > On Sat, 19 Dec 2009 11:04:57 +1100 Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > I said:
> > > > News: there will be no linux-next releases until at least Dec 24 and,
> > > > more likely, Dec 29. Have a Merry Christmas and take a break. :-)
> > >
> > > Well, I decided I had time for one more so it will be based in -rc1).
> > >
> > > This one has not had the build testing *between* merges, but has had all
> > > the normal build testing at the end. Since the latter testing showed no
> > > problems, this just means that there may be more unbisectable points in
> > > the tree (but that is unlikely).
> >
> >
> > When CONFIG_DT3155=y (i.e., not a loadable module):
>
> Ick, I'll change that to 'M' now, it shouldn't be built in just yet for
> the reasons you found.
>
> I don't think the code has ever been built as 'y' as you just found out.
Greg,
Did you get around to making any of these changes?
> > (a)
> > drivers/staging/dt3155/dt3155_drv.c:967: error: implicit declaration of function 'pci_find_device'
> > drivers/staging/dt3155/dt3155_drv.c:1151: error: implicit declaration of function 'request_irq'
> > drivers/staging/dt3155/dt3155_drv.c:1152: error: 'IRQF_SHARED' undeclared (first use in this function)
> > drivers/staging/dt3155/dt3155_drv.c:1152: error: 'IRQF_DISABLED' undeclared (first use in this function)
> > drivers/staging/dt3155/dt3155_drv.c:1195: error: implicit declaration of function 'free_irq'
> >
> >
> > #ifdef MODULE
> > #include <linux/interrupt.h>
> >
> > linux/interrupt.h is needed for DT3155=y, not just when DT3155=m.
> >
> > Oh, and this config has: # CONFIG_PCI_LEGACY is not set
> > which accounts for pci_find_device() being unknown.
> > If that is required (as it is currently, even though this function is
> > deprecated), it can be expressed in the driver's Kconfig file:
> > depends on PCI_LEGACY
> >
>
> I'll fix this up to just not need this anymore, as it should be fixed.
>
> > (b) when compiling goes further:
> >
> > drivers/staging/dt3155/dt3155_drv.c:571: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
> > drivers/staging/dt3155/dt3155_drv.c:571: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
> > drivers/staging/dt3155/dt3155_drv.c:657: warning: format '%x' expects type 'unsigned int', but argument 2 has type 'long unsigned int'
> > drivers/staging/dt3155/dt3155_drv.c:657: warning: format '%x' expects type 'unsigned int', but argument 3 has type 'long unsigned int'
> >
> >
> >
> > General:
> >
> > #ifndef CONFIG_PCI
> > #error "DT3155 : Kernel PCI support not enabled (DT3155 drive requires PCI)"
> > #endif
> >
> > That should be handled via Kconfig, not in a .c file.
> > Ah, it is done in Kconfig, so those lines above (in .c file) can be deleted.
>
> Yes, lots of stuff in the .c file can be deleted :)
---
~Randy
On Thu, Feb 11, 2010 at 08:44:30AM -0800, Randy Dunlap wrote:
> On Fri, 18 Dec 2009 20:47:47 -0800 Greg KH wrote:
>
> > On Fri, Dec 18, 2009 at 07:10:37PM -0800, Randy Dunlap wrote:
> > > On Sat, 19 Dec 2009 11:04:57 +1100 Stephen Rothwell wrote:
> > >
> > > > Hi all,
> > > >
> > > > I said:
> > > > > News: there will be no linux-next releases until at least Dec 24 and,
> > > > > more likely, Dec 29. Have a Merry Christmas and take a break. :-)
> > > >
> > > > Well, I decided I had time for one more so it will be based in -rc1).
> > > >
> > > > This one has not had the build testing *between* merges, but has had all
> > > > the normal build testing at the end. Since the latter testing showed no
> > > > problems, this just means that there may be more unbisectable points in
> > > > the tree (but that is unlikely).
> > >
> > >
> > > When CONFIG_DT3155=y (i.e., not a loadable module):
> >
> > Ick, I'll change that to 'M' now, it shouldn't be built in just yet for
> > the reasons you found.
> >
> > I don't think the code has ever been built as 'y' as you just found out.
>
> Greg,
> Did you get around to making any of these changes?
I have started working on them, but have not gotten to all of them yet.
thanks for your patience,
greg k-h