Hi all,
Changes since 20081118:
New tree:
m68k-current
Changed tree:
m86k is now a git tree
Undropped trees:
firmware
lblnet
Dropped trees (temporarily):
driver-core (build problem)
usb (depends on driver-core)
userns (it depends on creds)
semaphore-removal (due to unfixed conflicts against Linus' tree)
staging (depends on usb)
The sched tree gained a conflict against Linus' tree.
The net tree picked up a conflict from the cifs tree.
The rr tree lost its conflict.
The block tree gained a conflict against Linus' tree.
The security-testing 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,
44x_defconfig and allyesconfig and i386, sparc and sparc64 defconfig.
Below is a summary of the state of the merge.
We are up to 126 trees (counting Linus' and 15 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-2.6.26
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
CONFLICT (content): Merge conflict in include/linux/kernel.h
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
Merging quilt/driver-core
$ git reset --hard HEAD^
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging ftrace/auto-ftrace-next
Merging genirq/auto-genirq-next
Merging safe-poison-pointers/auto-safe-poison-pointers-next
Merging sched/auto-sched-next
CONFLICT (content): Merge conflict in kernel/Makefile
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging jfs/next
Merging kbuild/master
Merging quilt/ide
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
CONFLICT (content): Merge conflict in drivers/isdn/i4l/isdn_net.c
CONFLICT (content): Merge conflict in fs/cifs/connect.c
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in drivers/block/xen-blkfront.c
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 kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree.
$ git rm -f drivers/net/wan/syncppp.c
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-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 proc/proc
Merging bdev/master
Merging dwmw2-iommu/master
Merging cpu_alloc/cpu_alloc
CONFLICT (content): Merge conflict in kernel/lockdep.c
CONFLICT (content): Merge conflict in kernel/module.c
Applying cpu_alloc: merge_fix_1
Applying undefined reference to __per_cpu_start
Merging cputime/cputime
Merging perfmon3/master
Merging osd/linux-next
Merging fatfs/master
Merging quilt/staging
$ git reset --hard HEAD^
Merging scsi-post-merge/master
On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
> Dropped trees (temporarily):
> driver-core (build problem)
> usb (depends on driver-core)
> userns (it depends on creds)
> semaphore-removal (due to unfixed conflicts against Linus' tree)
> staging (depends on usb)
eh?
drivers/staging/go7007/go7007-v4l2.c:1338: error: too many arguments to function 'video_usercopy'
config attached.
---
~Randy
On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 3 has type 'struct v4l2_fract'
drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 4 has type 'struct v4l2_fract'
drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 5 has type 'struct v4l2_fract'
config attached.
---
~Randy
On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
(.text+0x104879): undefined reference to `add_mtd_device'
(.text+0x1048e1): undefined reference to `del_mtd_device'
mtd.c:(.text+0x104999): undefined reference to `mtd_erase_callback'
config attached.
---
~Randy
On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
(.text+0xae89b): undefined reference to `videobuf_dvb_get_frontend'
(.text+0xae91c): undefined reference to `videobuf_dvb_get_frontend'
cx88-mpeg.c:(.devinit.text+0x3f83): undefined reference to `videobuf_dvb_alloc_frontend'
cx88-mpeg.c:(.devinit.text+0x3fa8): undefined reference to `videobuf_dvb_dealloc_frontends'
config attached.
---
~Randy
On Wed, 2008-11-19 at 10:53 -0800, Randy Dunlap wrote:
> On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
>
> (.text+0x104879): undefined reference to `add_mtd_device'
> (.text+0x1048e1): undefined reference to `del_mtd_device'
> mtd.c:(.text+0x104999): undefined reference to `mtd_erase_callback'
>
>
> config attached.
CONFIG_SFC_MTD=y
What's that?
--
David Woodhouse Open Source Technology Centre
[email protected] Intel Corporation
On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
This can happen when these drivers are built as loadable modules or
built into the kernel image.
Loadable modules:
ERROR: "print_ssid" [drivers/net/wireless/ipw2200.ko] undefined!
ERROR: "print_ssid" [drivers/net/wireless/ipw2100.ko] undefined!
(modular config is attached)
In kernel image:
ipw2200.c:(.text+0x1d6f37): undefined reference to `print_ssid'
ipw2200.c:(.text+0x1d7466): undefined reference to `print_ssid'
ipw2200.c:(.text+0x1d75a3): undefined reference to `print_ssid'
ipw2200.c:(.text+0x1d779a): undefined reference to `print_ssid'
ipw2200.c:(.text+0x1d7815): undefined reference to `print_ssid'
drivers/built-in.o:ipw2200.c:(.text+0x1d7883): more undefined references to `print_ssid' follow
ipw2100.c:(.text+0x14c8b6): undefined reference to `print_ssid'
ipw2100.c:(.text+0x14fdae): undefined reference to `print_ssid'
ipw2100.c:(.text+0x1500ac): undefined reference to `print_ssid'
ipw2100.c:(.text+0x151810): undefined reference to `print_ssid'
ipw2100.c:(.text+0x151a27): undefined reference to `print_ssid'
drivers/built-in.o:ipw2200.c:(.text+0x159635): more undefined references to `print_ssid' follow
---
~Randy
David Woodhouse wrote:
> On Wed, 2008-11-19 at 10:53 -0800, Randy Dunlap wrote:
>> On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
>>
>> (.text+0x104879): undefined reference to `add_mtd_device'
>> (.text+0x1048e1): undefined reference to `del_mtd_device'
>> mtd.c:(.text+0x104999): undefined reference to `mtd_erase_callback'
>>
>>
>> config attached.
>
> CONFIG_SFC_MTD=y
>
> What's that?
drivers/net/sfc/Kconfig:
config SFC_MTD
bool "Solarflare Solarstorm SFC4000 flash MTD support"
depends on SFC && MTD
default y
help
This exposes the on-board flash memory as an MTD device (e.g.
/dev/mtd1). This makes it possible to upload new boot code
to the NIC.
sfc people added to cc.
--
~Randy
On Wed, 2008-11-19 at 11:06 -0800, Randy Dunlap wrote:
> drivers/net/sfc/Kconfig:
>
> config SFC_MTD
> bool "Solarflare Solarstorm SFC4000 flash MTD support"
> depends on SFC && MTD
> default y
> help
> This exposes the on-board flash memory as an MTD device (e.g.
> /dev/mtd1). This makes it possible to upload new boot code
> to the NIC.
>
>
> sfc people added to cc.
Sounds like this was built-in while CONFIG_MTD=m
--
David Woodhouse Open Source Technology Centre
[email protected] Intel Corporation
On Wed, Nov 19, 2008 at 10:48:51AM -0800, Randy Dunlap wrote:
> On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
>
> > Dropped trees (temporarily):
> > driver-core (build problem)
> > usb (depends on driver-core)
> > userns (it depends on creds)
> > semaphore-removal (due to unfixed conflicts against Linus' tree)
> > staging (depends on usb)
>
> eh?
>
> drivers/staging/go7007/go7007-v4l2.c:1338: error: too many arguments to function 'video_usercopy'
>
> config attached.
That's due to the portions of the staging tree that is in Linus's tree,
interacting with the v4l tree here. It's fixed in my staging tree that
normally gets into -next :)
thanks,
greg k-h
I guess that Stephen carried this patch for a few weeks, but now
he has stopped carrying linux-next build patches.
Still broken.
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
From: Randy Dunlap <[email protected]>
Needs a header file for credentials struct:
linux-next-20081023/fs/coda/file.c:177: error: dereferencing pointer to incomplete type
Signed-off-by: Randy Dunlap <[email protected]>
cc: Jan Harkes <[email protected]>
---
fs/coda/file.c | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20081119.orig/fs/coda/file.c
+++ linux-next-20081119/fs/coda/file.c
@@ -13,6 +13,7 @@
#include <linux/file.h>
#include <linux/fs.h>
#include <linux/stat.h>
+#include <linux/cred.h>
#include <linux/errno.h>
#include <linux/smp_lock.h>
#include <linux/string.h>
On Wed, 2008-11-19 at 11:06 -0800, Randy Dunlap wrote:
> David Woodhouse wrote:
> > On Wed, 2008-11-19 at 10:53 -0800, Randy Dunlap wrote:
> >> On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
> >>
> >> (.text+0x104879): undefined reference to `add_mtd_device'
> >> (.text+0x1048e1): undefined reference to `del_mtd_device'
> >> mtd.c:(.text+0x104999): undefined reference to `mtd_erase_callback'
> >>
> >>
> >> config attached.
> >
> > CONFIG_SFC_MTD=y
> >
> > What's that?
>
> drivers/net/sfc/Kconfig:
>
> config SFC_MTD
> bool "Solarflare Solarstorm SFC4000 flash MTD support"
> depends on SFC && MTD
> default y
> help
> This exposes the on-board flash memory as an MTD device (e.g.
> /dev/mtd1). This makes it possible to upload new boot code
> to the NIC.
>
>
> sfc people added to cc.
Please use the address [email protected], as listed in
MAINTAINERS. There are several of us working on the driver, and they
no longer include Michael Brown.
David Woodhouse wrote:
> Sounds like this was built-in while CONFIG_MTD=m
So does the dependency need to be something like
"depends on SFC && MTD && !(SFC=y && MTD=m)"?
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
On Wed, 2008-11-19 at 19:18 +0000, Ben Hutchings wrote:
> So does the dependency need to be something like
> "depends on SFC && MTD && !(SFC=y && MTD=m)"?
If it's a separate driver, perhaps it's sufficient just to make it a
tristate and make it depend on SFC && MTD?
--
dwmw2
From: Randy Dunlap <[email protected]>
Needs headers help for current_cred:
Adding only cred.h wasn't enough.
linux-next-20081023/fs/nfsctl.c:45: error: implicit declaration of function 'current_cred'
Signed-off-by: Randy Dunlap <[email protected]>
---
fs/nfsctl.c | 2 ++
1 file changed, 2 insertions(+)
--- linux-next-20081119.orig/fs/nfsctl.c
+++ linux-next-20081119/fs/nfsctl.c
@@ -10,6 +10,8 @@
#include <linux/sunrpc/svc.h>
#include <linux/nfsd/nfsd.h>
#include <linux/nfsd/syscall.h>
+#include <linux/cred.h>
+#include <linux/sched.h>
#include <linux/linkage.h>
#include <linux/namei.h>
#include <linux/mount.h>
On Wed, 2008-11-19 at 19:24 +0000, David Woodhouse wrote:
> On Wed, 2008-11-19 at 19:18 +0000, Ben Hutchings wrote:
> > So does the dependency need to be something like
> > "depends on SFC && MTD && !(SFC=y && MTD=m)"?
>
> If it's a separate driver, perhaps it's sufficient just to make it a
> tristate and make it depend on SFC && MTD?
It's not a separate driver.
Ben.
--
Ben Hutchings, Senior Software Engineer, Solarflare Communications
Not speaking for my employer; that's the marketing department's job.
They asked us to note that Solarflare product names are trademarked.
Ben Hutchings wrote:
> On Wed, 2008-11-19 at 19:24 +0000, David Woodhouse wrote:
>> On Wed, 2008-11-19 at 19:18 +0000, Ben Hutchings wrote:
>>> So does the dependency need to be something like
>>> "depends on SFC && MTD && !(SFC=y && MTD=m)"?
>> If it's a separate driver, perhaps it's sufficient just to make it a
>> tristate and make it depend on SFC && MTD?
>
> It's not a separate driver.
and it already depends on SFC && MTD. Weird that it fails like this.
--
~Randy
WARNING: arch/x86/kernel/built-in.o(.cpuinit.text+0x1d6): Section
mismatch in reference from the function fpu_init() to the
function .init.text:init_thread_xstate()
The function __cpuinit fpu_init() references
a function __init init_thread_xstate().
If init_thread_xstate is only used by fpu_init then
annotate init_thread_xstate with a matching annotation.
appears in arch/x86/kernel/built-in.o
-Richard Holden
Hi Mauro,
On Wed, 19 Nov 2008 10:51:00 -0800 Randy Dunlap <[email protected]> wrote:
>
> On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
(Randy, I didn't really ...)
> drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 3 has type 'struct v4l2_fract'
> drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 4 has type 'struct v4l2_fract'
> drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 5 has type 'struct v4l2_fract'
Introduced in commit b35e0c6035369de9f3273b6a3fbb1c67f830cf49 "4L/DVB
(9578): v4l core: add support for enumerating frame sizes and intervals"
and been there for some time now.
Mauro, please fix this.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
On Thu, 20 Nov 2008 11:02:53 +1100
Stephen Rothwell <[email protected]> wrote:
> Hi Mauro,
>
> On Wed, 19 Nov 2008 10:51:00 -0800 Randy Dunlap <[email protected]> wrote:
> >
> > On Wed, 19 Nov 2008 17:59:17 +1100 Stephen Rothwell wrote:
>
> (Randy, I didn't really ...)
>
> > drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 3 has type 'struct v4l2_fract'
> > drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 4 has type 'struct v4l2_fract'
> > drivers/media/video/v4l2-ioctl.c:1819: warning: format '%d' expects type 'int', but argument 5 has type 'struct v4l2_fract'
>
> Introduced in commit b35e0c6035369de9f3273b6a3fbb1c67f830cf49 "4L/DVB
> (9578): v4l core: add support for enumerating frame sizes and intervals"
> and been there for some time now.
>
> Mauro, please fix this.
I'll be fixing it today. Thank you and akpm for warning me.
>
--
Cheers,
Mauro