linux-next: Tree for February 4
Subsystems (4)
Hi all,
Changes since 20100203:
The trivial tree lost its conflict.
----------------------------------------------------------------------------
I have created today's linux-next tree atgit://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 156 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.
Signature · 210 lines
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 CONFLICT (content): Merge conflict in arch/arm/mach-mx25/clock.c 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 CONFLICT (content): Merge conflict in fs/gfs2/super.c Merging jfs/next Merging logfs/master Merging nfs/linux-next Applying: ceph: update for BDI_RECLAIMABLE change Merging nfsd/nfsd-next Merging nilfs2/for-next Merging ocfs2/linux-next 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 Merging reiserfs-bkl/reiserfs/kill-bkl Merging vfs/for-next CONFLICT (content): Merge conflict in fs/gfs2/ops_inode.c Applying: logfs: fixup for write_inode API change Merging pci/linux-next Merging hid/for-next Merging quilt/i2c Merging bjdooks-i2c/next-i2c CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig CONFLICT (content): Merge conflict in drivers/i2c/busses/Makefile 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 Merging ubi/linux-next Merging kvm/linux-next CONFLICT (content): Merge conflict in arch/x86/kvm/mmu.c CONFLICT (content): Merge conflict in arch/x86/kvm/x86.c 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 CONFLICT (content): Merge conflict in drivers/char/hvc_console.c CONFLICT (content): Merge conflict in drivers/char/hvc_console.h Merging mmc/next Merging tmio-mmc/linux-next CONFLICT (content): Merge conflict in drivers/mfd/asic3.c CONFLICT (content): Merge conflict in drivers/mfd/t7l66xb.c CONFLICT (content): Merge conflict in drivers/mfd/tc6387xb.c CONFLICT (content): Merge conflict in drivers/mfd/tc6393xb.c CONFLICT (add/add): Merge conflict in drivers/mfd/tmio_core.c CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.c CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.h CONFLICT (content): Merge conflict in include/linux/mfd/tmio.h 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 CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_fsnotify.c CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c CONFLICT (content): Merge conflict in include/linux/fs.h CONFLICT (content): Merge conflict in include/linux/fsnotify.h CONFLICT (content): Merge conflict in kernel/audit_tree.c 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 Merging omap_dss2/for-next CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3pandora.c Merging als/for-next Merging tip/auto-latest CONFLICT (delete/modify): kernel/kgdb.c deleted in HEAD and modified in tip/auto-latest. Version tip/auto-latest of kernel/kgdb.c left in tree. $ git rm -f kernel/kgdb.c Merging edac-amd/for-next Merging oprofile/for-next Merging percpu/for-next CONFLICT (content): Merge conflict in include/linux/ftrace_event.h CONFLICT (content): Merge conflict in include/trace/ftrace.h CONFLICT (content): Merge conflict in kernel/trace/trace_event_profile.c CONFLICT (content): Merge conflict in kernel/trace/trace_kprobe.c CONFLICT (content): Merge conflict in kernel/trace/trace_syscalls.c CONFLICT (content): Merge conflict in net/ipv6/proc.c Applying: slab: update for percpu API change Merging workqueues/for-next Merging sfi/sfi-test Merging asm-generic/next Merging hwpoison/hwpoison Merging sysctl/master Merging quilt/driver-core CONFLICT (content): Merge conflict in drivers/base/power/main.c CONFLICT (content): Merge conflict in drivers/pcmcia/ds.c Merging quilt/tty Merging quilt/usb Merging quilt/staging CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.c left in tree. CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.h left in tree. $ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h Merging scsi-post-merge/master
PATCH 1/1 i2c: fix xiic build error
From: Randy Dunlap <[email protected]>
Add header file to fix build error:
drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'
--- drivers/i2c/busses/i2c-xiic.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-xiic.c +1 -0
@@ -31,6 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/errno.h> +#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/i2c.h> #include <linux/interrupt.h>
Re: [PATCH -next] i2c: fix xiic build error
Quoted 16 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Add header file to fix build error:
drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'Signed-off-by Randy Dunlap <[email protected]>--- drivers/i2c/busses/i2c-xiic.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-xiic.c line 37
Quoted 7 lines
drivers/i2c/busses/i2c-xiic.c +1
-0@@ -31,6 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/errno.h> +#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/i2c.h> #include <linux/interrupt.h>
This patch is still needed in linux-next-20100216.
Signature · 1 line
~Randy
Re: [PATCH -next] i2c: fix xiic build error
Hi Randy,
Quoted 13 lines · Randy Dunlap
Quoted 12 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Add header file to fix build error:
drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'Signed-off-by Randy Dunlap <[email protected]>--- drivers/i2c/busses/i2c-xiic.c | 1 + 1 file changed, 1 insertion(+)
Quoted 14 lines
drivers/i2c/busses/i2c-xiic.c line 37
Quoted 11 lines
drivers/i2c/busses/i2c-xiic.c +1
-0@@ -31,6 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/errno.h> +#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/i2c.h> #include <linux/interrupt.h> This patch is still needed in linux-next-20100216.
Nothing I can do about it, as the i2c-xiic driver is neither upstream nor in my tree.
Signature · 1 line
Jean Delvare
Re: [PATCH -next] i2c: fix xiic build error
Quoted 31 lines · Jean Delvare
Hi Randy,
Quoted 13 lines · Randy Dunlap
Quoted 12 lines · Randy Dunlap
From: Randy Dunlap <[email protected]>
Add header file to fix build error:
drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'Signed-off-by Randy Dunlap <[email protected]>--- drivers/i2c/busses/i2c-xiic.c | 1 + 1 file changed, 1 insertion(+)Quoted 14 lines
drivers/i2c/busses/i2c-xiic.c line 37
Quoted 11 lines
drivers/i2c/busses/i2c-xiic.c +1
-0@@ -31,6 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/errno.h> +#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/i2c.h> #include <linux/interrupt.h> This patch is still needed in linux-next-20100216.
Quoted 3 lines
Nothing I can do about it, as the i2c-xiic driver is neither upstream nor in my tree.
Thanks, Jean.
Next/merge.log tells me:
Merge remote branch 'bjdooks-i2c/next-i2c'
Ben??
Signature · 1 line
~Randy
PATCH 1/1 i2c: fix xiic build error
Quoted 13 lines · Randy Dunlap
Quoted 11 lines · Jean Delvare
Hi Randy,
Quoted 4 lines · Randy Dunlap
On 02/04/10 12:11, Randy Dunlap wrote:
This patch is still needed in linux-next-20100216.
Nothing I can do about it, as the i2c-xiic driver is neither upstream nor in my tree.
Quoted 7 lines
Thanks, Jean.
Next/merge.log tells me:
Merge remote branch 'bjdooks-i2c/next-i2c'Ben??
ping Ben.
Here's the patch again.
---
From: Randy Dunlap <[email protected]>
Add header file to fix build error:
drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'
--- drivers/i2c/busses/i2c-xiic.c | 1 + 1 file changed, 1 insertion(+)
drivers/i2c/busses/i2c-xiic.c +1 -0
@@ -31,6 +31,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/errno.h> +#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/i2c.h> #include <linux/interrupt.h>
Re: [PATCH -next] i2c: fix xiic build error
Quoted 12 lines · Randy Dunlap
Quoted 11 lines · Randy Dunlap
Quoted 7 lines · Jean Delvare
Quoted 3 lines · Randy Dunlap
On 02/04/10 12:11, Randy Dunlap wrote:
This patch is still needed in linux-next-20100216.
Nothing I can do about it, as the i2c-xiic driver is neither upstream nor in my tree.
Thanks, Jean.
Quoted 7 lines
Quoted 5 lines
Next/merge.log tells me:
Merge remote branch 'bjdooks-i2c/next-i2c'Ben??
ping Ben.
Yes, please. Thx!
Quoted 32 lines
Here's the patch again.
---
From: Randy Dunlap <[email protected]>Add header file to fix build error:
drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'Signed-off-by Randy Dunlap <[email protected]>Cc "Ben Dooks (embedded platforms)" <[email protected]>---
drivers/i2c/busses/i2c-xiic.c | 1 +1 file changed, 1 insertion(+)drivers/i2c/busses/i2c-xiic.c +1
-1@@ -31,6 +31,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/errno.h> +#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/i2c.h> #include <linux/interrupt.h> --To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Signature · 10 lines
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 TorvaldsRe: [PATCH -next] i2c: fix xiic build error
Quoted 16 lines · Geert Uytterhoeven
Quoted 15 lines · Randy Dunlap
Quoted 14 lines · Randy Dunlap
Quoted 7 lines · Jean Delvare
Quoted 3 lines · Randy Dunlap
On 02/04/10 12:11, Randy Dunlap wrote:
This patch is still needed in linux-next-20100216.
Nothing I can do about it, as the i2c-xiic driver is neither upstream nor in my tree.
Thanks, Jean.
Next/merge.log tells me:
Merge remote branch 'bjdooks-i2c/next-i2c'
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Ben??
ping Ben.
Yes, please. Thx!
Ping? This build problem is almost one month old now...
Quoted 16 lines
Quoted 16 lines
Here's the patch again.
---
From: Randy Dunlap <[email protected]>Add header file to fix build error:
drivers/i2c/busses/i2c-xiic.c:493: error: implicit declaration of function 'mdelay'Signed-off-by Randy Dunlap <[email protected]>Cc "Ben Dooks (embedded platforms)" <[email protected]>---
drivers/i2c/busses/i2c-xiic.c | 1 +1 file changed, 1 insertion(+)
Quoted 10 lines
drivers/i2c/busses/i2c-xiic.c line 37
Quoted 10 lines
drivers/i2c/busses/i2c-xiic.c +1
-0@@ -31,6 +31,7 @@ #include <linux/module.h> #include <linux/init.h> #include <linux/errno.h> +#include <linux/delay.h> #include <linux/platform_device.h> #include <linux/i2c.h> #include <linux/interrupt.h>
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
PATCH 1/1 pci hotplug: fix ibmphp build error
In reply to Stephen RothwellFrom: Randy Dunlap <[email protected]>
Add header file to fix build error:
drivers/pci/hotplug/ibmphp_hpc.c:135: error: implicit declaration of function 'init_MUTEX' drivers/pci/hotplug/ibmphp_hpc.c:136: error: implicit declaration of function 'init_MUTEX_LOCKED' drivers/pci/hotplug/ibmphp_hpc.c:797: error: implicit declaration of function 'down' drivers/pci/hotplug/ibmphp_hpc.c:807: error: implicit declaration of function 'up'
--- drivers/pci/hotplug/ibmphp_hpc.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/hotplug/ibmphp_hpc.c +1 -0
@@ -35,6 +35,7 @@#include <linux/init.h> #include <linux/mutex.h> #include <linux/sched.h> +#include <linux/semaphore.h> #include <linux/kthread.h> #include "ibmphp.h"
Jesse Barnes
AppliedRe: [PATCH -next] pci hotplug: fix ibmphp build error
Quoted 20 lines · On Thu, 04 Feb 2010 12:12:23 -0800 Randy Dunlap <[email protected]> wrote:
From: Randy Dunlap <[email protected]>
Add header file to fix build error:
drivers/pci/hotplug/ibmphp_hpc.c:135: error: implicit declaration of function 'init_MUTEX'drivers/pci/hotplug/ibmphp_hpc.c:136: error:
implicit declaration of function 'init_MUTEX_LOCKED'drivers/pci/hotplug/ibmphp_hpc.c:797: error: implicit declaration of function 'down'drivers/pci/hotplug/ibmphp_hpc.c:807: error: implicit declaration of function 'up'Signed-off-by Randy Dunlap <[email protected]>--- drivers/pci/hotplug/ibmphp_hpc.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/hotplug/ibmphp_hpc.c line 41
Quoted 7 lines
drivers/pci/hotplug/ibmphp_hpc.c +1
-0@@ -35,6 +35,7 @@#include <linux/init.h> #include <linux/mutex.h> #include <linux/sched.h> +#include <linux/semaphore.h> #include <linux/kthread.h> #include "ibmphp.h"
Applied to linux-next, thanks.
Signature · 1 line
Jesse Barnes, Intel Open Source Technology Center