Hi all,
As the merge window is open, please do not add 2.6.37 material to your
linux-next included trees until after 2.6.36-rc1.
Changes since 20100810:
Linus' tree needed a patch to fix a merge and a revert for a modpost
patch.
The samsung tree gained conflicts against Linus' and the arm tree.
The ceph tree lost its merge fix.
The vfs tree lost its conflicts and merge fixes.
The bjdooks-i2c lost its conflicts.
The async_tx tree lost its conflict.
The mtd tree lost its conflicts.
The block tree lost its conflicts.
The trivial tree lost a conflict.
The fsnotify tree lost its conflict.
The limits tree lost its conflicts.
----------------------------------------------------------------------------
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 169 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/rc-fixes
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 gcl-current/merge
Applying: v9fs: fixup for inode_setattr being removed
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig
CONFLICT (content): Merge conflict in include/linux/serial_core.h
Merging davinci/davinci-next
Merging i.MX/for-next
Merging msm/for-next
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-s3c64xx/mach-smdk6410.c
CONFLICT (content): Merge conflict in arch/arm/plat-samsung/Kconfig
CONFLICT (content): Merge conflict in drivers/input/touchscreen/s3c2410_ts.c
Merging s5p/for-next
Merging tegra/for-next
CONFLICT (content): Merge conflict in arch/arm/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig
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
CONFLICT (content): Merge conflict in drivers/Makefile
Merging genesis/master
Merging sparc/master
Merging tile/master
Merging xtensa/master
CONFLICT (content): Merge conflict in arch/xtensa/configs/iss_defconfig
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
CONFLICT (content): Merge conflict in fs/logfs/logfs.h
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging omfs/for-next
Merging squashfs/master
Merging udf/for_next
Merging v9fs/for-next
Merging ubifs/linux-next
Merging xfs/master
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
CONFLICT (content): Merge conflict in MAINTAINERS
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/cx23885/Kconfig
CONFLICT (add/add): Merge conflict in drivers/media/video/v4l2-ctrls.c
Applying: v4l-dvb: fix up bad automatic merge
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging swiotlb-xen/master
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
CONFLICT (content): Merge conflict in drivers/xen/Makefile
CONFLICT (content): Merge conflict in include/xen/xen-ops.h
Merging ibft/master
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 arch/um/drivers/hostaudio_kern.c
CONFLICT (content): Merge conflict in drivers/block/virtio_blk.c
CONFLICT (content): Merge conflict in kernel/module.c
Applying: nfs: update for module_param_named API change
Applying: AppArmor: update for module_param_named API change
Merging input/next
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
CONFLICT (content): Merge conflict in drivers/md/dm.c
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
CONFLICT (content): Merge conflict in drivers/power/Kconfig
CONFLICT (content): Merge conflict in drivers/power/Makefile
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 viafb/viafb-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
CONFLICT (content): Merge conflict in fs/exofs/inode.c
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 catalin/for-next
Merging alacrity/linux-next
Merging i7core_edac/linux_next
CONFLICT (content): Merge conflict in MAINTAINERS
Merging devicetree/next-devicetree
Merging spi/next-spi
CONFLICT (content): Merge conflict in drivers/spi/mpc512x_psc_spi.c
Applying: spi: update for of_device to platform_device replacement
Merging limits/writable_limits
Merging omap_dss2/for-next
Merging xen/upstream/xen
Merging tip/auto-latest
Merging lost-spurious-irq/lost-spurious-irq
CONFLICT (content): Merge conflict in drivers/ata/sata_fsl.c
CONFLICT (content): Merge conflict in drivers/ata/sata_mv.c
CONFLICT (content): Merge conflict in drivers/ata/sata_nv.c
CONFLICT (content): Merge conflict in include/linux/libata.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 drivers-x86/linux-next
Merging hwpoison/hwpoison
CONFLICT (content): Merge conflict in mm/memory-failure.c
Merging sysctl/master
Merging bkl-core/bkl/core
Merging bkl-procfs/bkl/procfs
Merging bkl-ioctl/bkl/ioctl
Merging quilt/driver-core
Merging quilt/tty
CONFLICT (content): Merge conflict in drivers/char/Makefile
CONFLICT (content): Merge conflict in drivers/char/vt.c
CONFLICT (content): Merge conflict in include/linux/serial_core.h
CONFLICT (content): Merge conflict in include/linux/tty.h
Merging quilt/usb
Merging staging-next/staging-next
Merging slabh/slabh
Merging scsi-post-merge/merge-base:master
$ git checkout scsi-post-merge/master
[master 9b3e523] Revert "scripts/mod/modpost.c: fix memory leak"
On Wed, 11 Aug 2010 14:00:09 +1000 Stephen Rothwell wrote:
> Hi all,
>
> As the merge window is open, please do not add 2.6.37 material to your
> linux-next included trees until after 2.6.36-rc1.
>
> Changes since 20100810:
on i386 (X86_32):
arch/x86/kernel/hpet.c:840: warning: integer overflow in expression
hpet_freq = FSEC_PER_NSEC * NSEC_PER_SEC;
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
From: Randy Dunlap <[email protected]>
jc42 uses i2c interfaces, so it should depend on I2C.
drivers/hwmon/jc42.c:426: error: implicit declaration of function 'i2c_check_functionality'
drivers/hwmon/jc42.c:521: error: implicit declaration of function 'i2c_smbus_read_word_data'
drivers/hwmon/jc42.c:529: error: implicit declaration of function 'i2c_smbus_write_word_data'
drivers/hwmon/jc42.c:580: error: implicit declaration of function 'i2c_add_driver'
drivers/hwmon/jc42.c:585: error: implicit declaration of function 'i2c_del_driver'
Signed-off-by: Randy Dunlap <[email protected]>
Cc: [email protected]
---
drivers/hwmon/Kconfig | 1 +
1 file changed, 1 insertion(+)
--- linux-next-20100811.orig/drivers/hwmon/Kconfig
+++ linux-next-20100811/drivers/hwmon/Kconfig
@@ -465,6 +465,7 @@ config SENSORS_JZ4740
config SENSORS_JC42
tristate "JEDEC JC42.4 compliant temperature sensors"
+ depends on I2C
help
If you say yes here you get support for Jedec JC42.4 compliant
temperature sensors. Support will include, but not be limited to,
From: Randy Dunlap <[email protected]>
Prevent build errors when SCSI is not enabled:
iscsi_ibft.c:(.init.text+0x548d): undefined reference to `iscsi_boot_create_initiator'
iscsi_ibft.c:(.init.text+0x54a9): undefined reference to `iscsi_boot_create_ethernet'
iscsi_ibft.c:(.init.text+0x54c5): undefined reference to `iscsi_boot_create_target'
iscsi_ibft.c:(.init.text+0x55ff): undefined reference to `iscsi_boot_destroy_kset'
iscsi_ibft.c:(.init.text+0x561e): undefined reference to `iscsi_boot_create_kset'
iscsi_ibft.c:(.exit.text+0xe2c): undefined reference to `iscsi_boot_destroy_kset'
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Peter Jones <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
---
drivers/firmware/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-next-20100811.orig/drivers/firmware/Kconfig
+++ linux-next-20100811/drivers/firmware/Kconfig
@@ -125,7 +125,7 @@ config ISCSI_IBFT_FIND
config ISCSI_IBFT
tristate "iSCSI Boot Firmware Table Attributes module"
select ISCSI_BOOT_SYSFS
- depends on ISCSI_IBFT_FIND
+ depends on ISCSI_IBFT_FIND && SCSI
default n
help
This option enables support for detection and exposing of iSCSI
On Wed, 2010-08-11 at 13:35 -0400, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> jc42 uses i2c interfaces, so it should depend on I2C.
>
> drivers/hwmon/jc42.c:426: error: implicit declaration of function 'i2c_check_functionality'
> drivers/hwmon/jc42.c:521: error: implicit declaration of function 'i2c_smbus_read_word_data'
> drivers/hwmon/jc42.c:529: error: implicit declaration of function 'i2c_smbus_write_word_data'
> drivers/hwmon/jc42.c:580: error: implicit declaration of function 'i2c_add_driver'
> drivers/hwmon/jc42.c:585: error: implicit declaration of function 'i2c_del_driver'
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: [email protected]
Acked-by: Guenter Roeck <[email protected]>
> ---
> drivers/hwmon/Kconfig | 1 +
> 1 file changed, 1 insertion(+)
>
> --- linux-next-20100811.orig/drivers/hwmon/Kconfig
> +++ linux-next-20100811/drivers/hwmon/Kconfig
> @@ -465,6 +465,7 @@ config SENSORS_JZ4740
>
> config SENSORS_JC42
> tristate "JEDEC JC42.4 compliant temperature sensors"
> + depends on I2C
> help
> If you say yes here you get support for Jedec JC42.4 compliant
> temperature sensors. Support will include, but not be limited to,
On Wed, 2010-08-11 at 08:51 -0700, Randy Dunlap wrote:
> On Wed, 11 Aug 2010 14:00:09 +1000 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > As the merge window is open, please do not add 2.6.37 material to your
> > linux-next included trees until after 2.6.36-rc1.
> >
> > Changes since 20100810:
>
>
> on i386 (X86_32):
>
> arch/x86/kernel/hpet.c:840: warning: integer overflow in expression
>
> hpet_freq = FSEC_PER_NSEC * NSEC_PER_SEC;
I think the patch from Chris Wilson resolves this.
Thomas: I sent this with another fix that needs to go in. Could you
merge those in when you get a chance?
thanks
-john
On Wed, 11 Aug 2010 10:43:31 -0700, Guenter Roeck wrote:
> On Wed, 2010-08-11 at 13:35 -0400, Randy Dunlap wrote:
> > From: Randy Dunlap <[email protected]>
> >
> > jc42 uses i2c interfaces, so it should depend on I2C.
> >
> > drivers/hwmon/jc42.c:426: error: implicit declaration of function 'i2c_check_functionality'
> > drivers/hwmon/jc42.c:521: error: implicit declaration of function 'i2c_smbus_read_word_data'
> > drivers/hwmon/jc42.c:529: error: implicit declaration of function 'i2c_smbus_write_word_data'
> > drivers/hwmon/jc42.c:580: error: implicit declaration of function 'i2c_add_driver'
> > drivers/hwmon/jc42.c:585: error: implicit declaration of function 'i2c_del_driver'
> >
> > Signed-off-by: Randy Dunlap <[email protected]>
> > Cc: [email protected]
> Acked-by: Guenter Roeck <[email protected]>
Applied, thanks.
--
Jean Delvare
On 08/11/2010 01:36 PM, Randy Dunlap wrote:
> From: Randy Dunlap <[email protected]>
>
> Prevent build errors when SCSI is not enabled:
>
> iscsi_ibft.c:(.init.text+0x548d): undefined reference to `iscsi_boot_create_initiator'
> iscsi_ibft.c:(.init.text+0x54a9): undefined reference to `iscsi_boot_create_ethernet'
> iscsi_ibft.c:(.init.text+0x54c5): undefined reference to `iscsi_boot_create_target'
> iscsi_ibft.c:(.init.text+0x55ff): undefined reference to `iscsi_boot_destroy_kset'
> iscsi_ibft.c:(.init.text+0x561e): undefined reference to `iscsi_boot_create_kset'
> iscsi_ibft.c:(.exit.text+0xe2c): undefined reference to `iscsi_boot_destroy_kset'
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: Peter Jones <[email protected]>
> Cc: Konrad Rzeszutek Wilk <[email protected]>
This looks good to me, thanks for catching it.
Signed-of-by: Peter Jones <[email protected]>
> ---
> drivers/firmware/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-next-20100811.orig/drivers/firmware/Kconfig
> +++ linux-next-20100811/drivers/firmware/Kconfig
> @@ -125,7 +125,7 @@ config ISCSI_IBFT_FIND
> config ISCSI_IBFT
> tristate "iSCSI Boot Firmware Table Attributes module"
> select ISCSI_BOOT_SYSFS
> - depends on ISCSI_IBFT_FIND
> + depends on ISCSI_IBFT_FIND && SCSI
> default n
> help
> This option enables support for detection and exposing of iSCSI
> --
> 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/
--
Peter
RFC 882 put the dots in .com.
01234567890123456789012345678901234567890123456789012345678901234567890123456789