Hi all,
Changes since 20090409:
New tree:
nilfs2
This tree will not build a powerpc allyesconfig.
Linus' tree gained another build failure for which I applied a patch.
The tip-core tree build failure still exists so I reapplied the patch.
The v4l-dvb tree lost its conflicts.
The rr tree lost its conflicts.
The cifs tree gained a build failure so I used the version from
next-20090409.
The block tree build failure still exists so I used the version from
next-20090408.
The firmware tree lost its conflicts but gained a build failure so I
reverted a commit.
The kmemleak tree lost a conflict.
----------------------------------------------------------------------------
I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git
(patches at
http://www.kernel.org/pub/linux/kernel/people/sfr/linux-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) 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 133 trees (counting Linus' and 18 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 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/master
Merging quilt/driver-core.current
Merging quilt/usb.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 dwmw2/master
Merging arm/devel
Merging avr32/avr32-arch
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging tracing/auto-tracing-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
CONFLICT (content): Merge conflict in drivers/ide/ide-disk.c
Merging libata/NEXT
Merging nfs/linux-next
Merging xfs/master
Merging infiniband/for-next
Merging acpi/test
Merging nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
Merging cifs/master
$ git reset --hard HEAD^
Merging refs/next/20090409/cifs
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
$ git reset --hard HEAD^
Merging refs/next/20090408/block
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 quilt/ttydev
CONFLICT (content): Merge conflict in drivers/serial/8250_pci.c
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging generic-ipi/auto-generic-ipi-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slob.c
Merging suspend/linux-next
Merging nilfs2/for-next
Merging quilt/driver-core
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
Applying: sparc64: update for restart_block size change
[master 8d0d359] Revert "parport: Use the PCI IRQ if offered"
[master b658e99] Revert "firmware: speed up request_firmware()"
Applying: sparc: asm/atomic.h on 32bit should include asm/system.h for xchg
Today's next tree build (defconfig s390x ) failed with following
error.
In file included from kernel/panic.c:11:
include/linux/debug_locks.h: In function __debug_locks_off:
include/linux/debug_locks.h:15: error: implicit declaration of function xchg
Probably because of commit 9eeba6138cefc0435695463ddadb0d95e0a6bcd2.
Thanks
-Sachin
--
---------------------------------
Sachin Sant
IBM Linux Technology Center
India Systems and Technology Labs
Bangalore, India
---------------------------------
From: Sachin Sant <[email protected]>
Date: Tue, 14 Apr 2009 14:10:53 +0530
> Today's next tree build (defconfig s390x ) failed with following
> error.
>
> In file included from kernel/panic.c:11:
> include/linux/debug_locks.h: In function __debug_locks_off:
> include/linux/debug_locks.h:15: error: implicit declaration of
> function xchg
>
> Probably because of commit 9eeba6138cefc0435695463ddadb0d95e0a6bcd2.
I see that Stephen fixed this by adding a asm/system.h include
to asm/atomic.h on sparc.
I don't agree with this, and now we have yet another platform
broken in the same way.
If debug_locks.h needs xchg() I think it should include asm/system.h
which was always the traditional location from which to include that
declaration.
It is even the case on x86.
We get it via asm/atomic.h by accident on x86 and other platforms, not
because that's the canonical location from which to get xchg().
building of next-20090414 fails for ARM with CONFIG_OABI_COMPAT:
arch/arm/kernel/sys_oabi-compat.c: In function 'sys_oabi_epoll_wait':
arch/arm/kernel/sys_oabi-compat.c:288: error: implicit declaration of
function 'kmalloc'
arch/arm/kernel/sys_oabi-compat.c:288: error: 'GFP_KERNEL' undeclared
(first use in this function)
arch/arm/kernel/sys_oabi-compat.c:288: error: (Each undeclared
identifier is reported only once
arch/arm/kernel/sys_oabi-compat.c:288: error: for each function it
appears in.)
arch/arm/kernel/sys_oabi-compat.c:288: warning: assignment makes
pointer from integer without a cast
arch/arm/kernel/sys_oabi-compat.c:301: error: implicit declaration of
function 'kfree'
arch/arm/kernel/sys_oabi-compat.c: In function 'sys_oabi_semtimedop':
arch/arm/kernel/sys_oabi-compat.c:324: error: 'GFP_KERNEL' undeclared
(first use in this function)
arch/arm/kernel/sys_oabi-compat.c:324: warning: assignment makes
pointer from integer without a cast
make[1]: *** [arch/arm/kernel/sys_oabi-compat.o] Error 1
make: *** [arch/arm/kernel] Error 2
--
Matthias Kaehlcke
Embedded Linux Engineer
Barcelona
Don't walk behind me, I may not lead
Don't walk in front of me, I may not follow
Just walk beside me and be my friend
(Albert Camus)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-
On Tue, Apr 14, 2009 at 04:08:09PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090409:
<snip>
Is linux-next open for 2.6.31 patches yet? Or is that already happening
and I just missed the email somewhere?
thanks,
greg k-h
Hi Greg,
On Tue, 14 Apr 2009 18:15:12 -0700 Greg KH <[email protected]> wrote:
>
> Is linux-next open for 2.6.31 patches yet? Or is that already happening
> and I just missed the email somewhere?
The reminder I send out is that I don't want 2.6.(x+1) stuff until
2.6.x-rc1 is out. (I wanted to wait for -rc2, but Andrew insisted.)
So, "yes. yes." :-)
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Wed, Apr 15, 2009 at 11:52:01AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> On Tue, 14 Apr 2009 18:15:12 -0700 Greg KH <[email protected]> wrote:
> >
> > Is linux-next open for 2.6.31 patches yet? Or is that already happening
> > and I just missed the email somewhere?
>
> The reminder I send out is that I don't want 2.6.(x+1) stuff until
> 2.6.x-rc1 is out. (I wanted to wait for -rc2, but Andrew insisted.)
>
> So, "yes. yes." :-)
thanks for the clarification.
greg k-h