Hi all,
Changes since 20090615:
Removed tree: kmemleak (served its purpose)
This tree fails to build for powerpc allyesconfig.
The ext4 tree gained a build failure (after the slab tree was merged) so
I reverted 3 commits.
The ide tree lost its build failure.
The scsi tree lost its build failure.
The net tree lost its conflicts.
The rr tree lost a conflict, but gained another against Linus' tree.
The cifs tree lost its build failure.
The mfd tree lost its conflict.
The tip tree gained a conflict against the slab tree.
The driver-core tree lost 4 conflicts, but gained 2 more against the
powerpc tree.
The usb tree lost its conflicts.
The staging tree lost its conflicts.
----------------------------------------------------------------------------
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 128 trees (counting Linus' and 19 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/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 microblaze/next
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
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 xtensa/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in include/linux/mmc/sdio_ids.h
Merging quota/for_next
Merging kbuild/master
Merging ide/for-next
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig
CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c
[master f9af17c] Revert "Merge branch 'oqo-wmi-EXPECT-REFRESH' into test"
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
CONFLICT (content): Merge conflict in arch/x86/include/asm/mce.h
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_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 arch/sh/include/asm/smp.h
CONFLICT (content): Merge conflict in drivers/net/sfc/efx.c
Merging cifs/master
Merging mmc/next
Merging input/next
Merging bkl-removal/bkl-removal
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
[master af5fbd8] Revert "jbd2: convert instrumentation from markers to tracepoints"
[master 2ef5ca0] Revert "ext4: Fix 64-bit block type problem on 32-bit platforms"
[master 5d150fb] Revert "ext4: convert instrumentation from markers to tracepoints"
Merging uclinux/for-next
Merging md/for-next
CONFLICT (content): Merge conflict in drivers/md/md.c
CONFLICT (content): Merge conflict in drivers/md/raid5.c
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
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
CONFLICT (content): Merge conflict in drivers/watchdog/Makefile
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in kernel/sched.c
CONFLICT (content): Merge conflict in mm/Makefile
CONFLICT (content): Merge conflict in mm/slub.c
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/block/ps3disk.c
CONFLICT (content): Merge conflict in drivers/block/ps3vram.c
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
Applying: sparc: replace uses of CPU_MASK_ALL_PTR
Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20090615:
When
CONFIG_BLK_DEV_OSD=y
CONFIG_SCSI_OSD_INITIATOR=y
# CONFIG_SCSI_OSD_ULD is not set
build fails with
drivers/built-in.o: In function `class_osdblk_remove':
osdblk.c:(.text+0x55376): undefined reference to `osduld_put_device'
drivers/built-in.o: In function `class_osdblk_add':
osdblk.c:(.text+0x5564d): undefined reference to `osduld_path_lookup'
osdblk.c:(.text+0x5584d): undefined reference to `osduld_put_device'
--
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
From: Randy Dunlap <[email protected]>
BNX2I selects CNIC, CNIC selects UIO.
It looks like BNX2I also needs to select UIO.
BTW, CNIC is under NETDEV_1000, which is not enabled.
I don't see any need to enable (select) it in this case,
but I could be wrong(?). Should BNX2I also select NETDEV_1000?
cnic.c:(.text+0x17990b): undefined reference to `uio_event_notify'
cnic.c:(.text+0x17a197): undefined reference to `uio_unregister_device'
cnic.c:(.text+0x17c618): undefined reference to `__uio_register_device'
Signed-off-by: Randy Dunlap <[email protected]>
---
drivers/scsi/bnx2i/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20090616.orig/drivers/scsi/bnx2i/Kconfig
+++ linux-next-20090616/drivers/scsi/bnx2i/Kconfig
@@ -2,6 +2,7 @@ config SCSI_BNX2_ISCSI
tristate "Broadcom NetXtreme II iSCSI support"
select SCSI_ISCSI_ATTRS
select CNIC
+ select UIO
depends on PCI
---help---
This driver supports iSCSI offload for the Broadcom NetXtreme II
--
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/
linux-next still fails with various pci_*() undefined references, like:
ERROR: "pci_scan_slot" [drivers/pci/hotplug/cpqphp.ko] undefined!
ERROR: "pci_add_new_bus" [drivers/pci/hotplug/cpqphp.ko] undefined!
and
drivers/pci/hotplug/fakephp.c:55: error:implicit declaration of function 'pci_rescan_bus'
These are due to the eeepc driver's Kconfig selects. Patch below
fixes them.
---
From: Randy Dunlap <[email protected]>
EEEPC_LAPTOP selects HOTPLUG_PCI. This causes failures (build error below)
when CONFIG_HOTPLUG is not enabled, so additionally select HOTPLUG since
kconfig 'select' doesn't follow its dependency chain.
Also, only select HOTPLUG_PCI if PCI is already enabled.
drivers/pci/hotplug/fakephp.c:55: error: implicit declaration of function 'pci_rescan_bus'
ERROR: "pci_scan_slot" [drivers/pci/hotplug/pciehp.ko] undefined!
ERROR: "pci_scan_bridge" [drivers/pci/hotplug/pciehp.ko] undefined!
ERROR: "pci_scan_slot" [drivers/pci/hotplug/pci_hotplug.ko] undefined!
ERROR: "pci_add_new_bus" [drivers/pci/hotplug/pci_hotplug.ko] undefined!
Signed-off-by: Randy Dunlap <[email protected]>
Acked-by: Corentin Chary <[email protected]>
---
drivers/platform/x86/Kconfig | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- linux-next-20090604.orig/drivers/platform/x86/Kconfig
+++ linux-next-20090604/drivers/platform/x86/Kconfig
@@ -340,7 +340,8 @@ config EEEPC_LAPTOP
depends on RFKILL || RFKILL = n
select BACKLIGHT_CLASS_DEVICE
select HWMON
- select HOTPLUG_PCI
+ select HOTPLUG
+ select HOTPLUG_PCI if PCI
---help---
This driver supports the Fn-Fx keys on Eee PC laptops.
It also adds the ability to switch camera/wlan on/off.
On Tue, 2009-06-16 at 10:25 -0700, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> BNX2I selects CNIC, CNIC selects UIO.
> It looks like BNX2I also needs to select UIO.
>
Yeah, it looks like if A selects B and B selects C, A does not
automatically select C, so we need to add it explicitly.
> BTW, CNIC is under NETDEV_1000, which is not enabled.
> I don't see any need to enable (select) it in this case,
> but I could be wrong(?). Should BNX2I also select NETDEV_1000?
No that's not needed assuming we stay with using symbol_get() to resolve
a bnx2 driver symbol for now.
Thanks.
Acked-by: Michael Chan <[email protected]>
>
> cnic.c:(.text+0x17990b): undefined reference to `uio_event_notify'
> cnic.c:(.text+0x17a197): undefined reference to `uio_unregister_device'
> cnic.c:(.text+0x17c618): undefined reference to `__uio_register_device'
>
> Signed-off-by: Randy Dunlap <[email protected]>
> ---
> drivers/scsi/bnx2i/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> --- linux-next-20090616.orig/drivers/scsi/bnx2i/Kconfig
> +++ linux-next-20090616/drivers/scsi/bnx2i/Kconfig
> @@ -2,6 +2,7 @@ config SCSI_BNX2_ISCSI
> tristate "Broadcom NetXtreme II iSCSI support"
> select SCSI_ISCSI_ATTRS
> select CNIC
> + select UIO
> depends on PCI
> ---help---
> This driver supports iSCSI offload for the Broadcom NetXtreme II
>
>
On 06/16/2009 07:46 PM, Randy Dunlap wrote:
> Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20090615:
>
>
> When
> CONFIG_BLK_DEV_OSD=y
> CONFIG_SCSI_OSD_INITIATOR=y
> # CONFIG_SCSI_OSD_ULD is not set
>
> build fails with
>
> drivers/built-in.o: In function `class_osdblk_remove':
> osdblk.c:(.text+0x55376): undefined reference to `osduld_put_device'
> drivers/built-in.o: In function `class_osdblk_add':
> osdblk.c:(.text+0x5564d): undefined reference to `osduld_path_lookup'
> osdblk.c:(.text+0x5584d): undefined reference to `osduld_put_device'
>
>
Thanks, osdblk has the wrong dependency, I will fix it.
Boaz
Hi Boaz,
On Wed, 17 Jun 2009 15:45:18 +0300 Boaz Harrosh <[email protected]> wrote:
>
> Thanks, osdblk has the wrong dependency, I will fix it.
Thanks.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
I will be squashing the below patch into the osdblk patch and will
rebase the "linux-next" branch. (No one is dependent on this branch
so there is no reason not too)
---
Stephen Rothwell wrote:
When
CONFIG_BLK_DEV_OSD=y
CONFIG_SCSI_OSD_INITIATOR=y
\# CONFIG_SCSI_OSD_ULD is not set
build fails with:
drivers/built-in.o: In function `class_osdblk_remove':
osdblk.c:(.text+0x55376): undefined reference to `osduld_put_device'
drivers/built-in.o: In function `class_osdblk_add':
osdblk.c:(.text+0x5564d): undefined reference to `osduld_path_lookup'
osdblk.c:(.text+0x5584d): undefined reference to `osduld_put_device'
Fix by setting the proper dependency for this driver
Signed-off-by: Boaz Harrosh <[email protected]>
---
drivers/block/Kconfig | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 2f55a4b..1d886e0 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -300,7 +300,7 @@ config BLK_DEV_NBD
config BLK_DEV_OSD
tristate "OSD object-as-blkdev support"
- depends on SCSI_OSD_INITIATOR
+ depends on SCSI_OSD_ULD
---help---
Saying Y or M here will allow the exporting of a single SCSI
OSD (object-based storage) object as a Linux block device.
--
1.6.2.1
Hi Boaz,
On Wed, 17 Jun 2009 16:36:28 +0300 Boaz Harrosh <[email protected]> wrote:
>
> Stephen Rothwell wrote:
> When
> CONFIG_BLK_DEV_OSD=y
> CONFIG_SCSI_OSD_INITIATOR=y
> \# CONFIG_SCSI_OSD_ULD is not set
Actually it was Randy Dunlap.
--
Cheers,
Stephen Rothwell [email protected]
http://www.canb.auug.org.au/~sfr/
Boaz Harrosh wrote:
> I will be squashing the below patch into the osdblk patch and will
> rebase the "linux-next" branch. (No one is dependent on this branch
> so there is no reason not too)
>
> ---
> Stephen Rothwell wrote:
> When
> CONFIG_BLK_DEV_OSD=y
> CONFIG_SCSI_OSD_INITIATOR=y
> \# CONFIG_SCSI_OSD_ULD is not set
>
> build fails with:
> drivers/built-in.o: In function `class_osdblk_remove':
> osdblk.c:(.text+0x55376): undefined reference to `osduld_put_device'
> drivers/built-in.o: In function `class_osdblk_add':
> osdblk.c:(.text+0x5564d): undefined reference to `osduld_path_lookup'
> osdblk.c:(.text+0x5584d): undefined reference to `osduld_put_device'
>
> Fix by setting the proper dependency for this driver
>
> Signed-off-by: Boaz Harrosh <[email protected]>
Acked-by: Randy Dunlap <[email protected]>
Thanks.
> ---
> drivers/block/Kconfig | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
> index 2f55a4b..1d886e0 100644
> --- a/drivers/block/Kconfig
> +++ b/drivers/block/Kconfig
> @@ -300,7 +300,7 @@ config BLK_DEV_NBD
>
> config BLK_DEV_OSD
> tristate "OSD object-as-blkdev support"
> - depends on SCSI_OSD_INITIATOR
> + depends on SCSI_OSD_ULD
> ---help---
> Saying Y or M here will allow the exporting of a single SCSI
> OSD (object-based storage) object as a Linux block device.
--
~Randy
LPC 2009, Sept. 23-25, Portland, Oregon
http://linuxplumbersconf.org/2009/