Hi all,
Changes since 20110218:
Dropped tree: xen
My fixes tree contains:
fixdep: Do not record dependency on the source file itself
The hwmon-staging tree gained a conflict against the jdelvare-hwmon tree.
The kvm tree gained a build failure for which I reverted 3 commits.
The net tree lost its conflicts.
The workqueue tree lost its build failure to the input tree, so I applied
the merge fix patch there.
The omap_dss2 tree gained conflicts against the omap tree.
The trivial tree gained a conflict against the jdelvare-hwmon tree.
The staging tree lost its conflict.
The powerpc allyesconfig build is still broken by some obscure bloating
of the low memory code.
----------------------------------------------------------------------------
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 188 trees (counting Linus' and 28 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 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 52xx-and-virtex-current/powerpc/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 driver-core.current/driver-core-linus
Merging tty.current/tty-linus
Merging usb.current/usb-linus
Merging staging.current/staging-linus
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 sh-current/sh-fixes-for-linus
Merging rmobile-current/rmobile-fixes-for-linus
Merging fbdev-current/fbdev-fixes-for-linus
Merging devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging davinci/davinci-next
Merging i.MX/for-next
Merging linux-spec/for-next
Merging msm/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x27.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-qsd8x50.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-sapphire.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/include/mach/memory.h
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
Merging tegra/for-next
Merging ux500-core/ux500-core
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
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/for-next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
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
CONFLICT (content): Merge conflict in fs/ext4/mballoc.c
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging hfsplus/for-next
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 vfs-scale/vfs-scale-working
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
Merging quilt/jdelvare-hwmon
Merging hwmon-staging/hwmon-next
CONFLICT (content): Merge conflict in drivers/hwmon/Makefile
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 idle-test/idle-test
Merging powertools/tools-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging swiotlb/master
Merging ibft/master
Merging scsi/master
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
Applying: input: update for FREEZEABLE -> FREEZABLE change
Merging input-mt/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
CONFLICT (content): Merge conflict in drivers/leds/Kconfig
Merging backlight/for-mm
Merging mmc/mmc-next
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 fbdev/master
Merging viafb/viafb-next
Merging omap_dss2/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/Makefile
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-3430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-am3517evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_2420_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap_hwmod_2430_data.c
Merging voltage/for-next
Merging security-testing/next
Merging selinux/master
Merging lblnet/master
Merging agp/agp-next
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 MAINTAINERS
Merging audit/for-next
Merging suspend/linux-next
Merging fsnotify/for-next
Merging irda/for-next
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/Makefile
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging i7300_edac/linux_next
Merging devicetree/devicetree/next
CONFLICT (content): Merge conflict in drivers/spi/pxa2xx_spi_pci.c
Merging spi/spi/next
Merging tip/auto-latest
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/xen/page.h
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/vmlinux.lds.S
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
Applying: OLPC: fix for removal of run_wake_count
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
CONFLICT (content): Merge conflict in drivers/tty/serial/68328serial.c
CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next
CONFLICT (content): Merge conflict in drivers/usb/gadget/Kconfig
Merging staging/staging-next
Merging slabh/slabh
Merging bkl-trivial/trivial
Merging bkl-llseek/llseek
Merging bkl-vfs/vfs
Merging bkl-config/config
CONFLICT (content): Merge conflict in arch/powerpc/kernel/setup_64.c
CONFLICT (content): Merge conflict in drivers/scsi/pm8001/pm8001_sas.h
CONFLICT (delete/modify): drivers/staging/stradis/Kconfig deleted in HEAD and modified in bkl-config/config. Version bkl-config/config of drivers/staging/stradis/Kconfig left in tree.
CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c
CONFLICT (content): Merge conflict in include/linux/hardirq.h
CONFLICT (content): Merge conflict in include/linux/smp_lock.h
$ git rm -f drivers/staging/stradis/Kconfig
Merging irqflags/master
Merging cleancache/linux-next
CONFLICT (content): Merge conflict in fs/ocfs2/super.c
CONFLICT (content): Merge conflict in fs/super.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in mm/Kconfig
Merging scsi-post-merge/merge-base:master
$ git checkout scsi-post-merge/master
[master fa739e0] Revert "mm: remove is_hwpoison_address"
[master d939e44] Revert "KVM: Replace is_hwpoison_address with __get_user_pages"
[master 97d34f4] Revert "mm: make __get_user_pages return -EHWPOISON for HWPOISON page optionally"
On Mon, 21 Feb 2011 18:21:34 +1100 Stephen Rothwell wrote:
> Hi all,
>
> Changes since 20110218:
When CONFIG_PM_RUNTIME is not enabled:
drivers/usb/serial/usb_wwan.c:702: error: 'struct dev_pm_info' has no member named 'usage_count'
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Monday, February 21, 2011, Randy Dunlap wrote:
> On Mon, 21 Feb 2011 18:21:34 +1100 Stephen Rothwell wrote:
>
> > Hi all,
> >
> > Changes since 20110218:
>
>
> When CONFIG_PM_RUNTIME is not enabled:
>
> drivers/usb/serial/usb_wwan.c:702: error: 'struct dev_pm_info' has no member named 'usage_count'
This looks like a bug in the driver that shouldn't access this field directly.
Thanks,
Rafael
From: Randy Dunlap <[email protected]>
drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c:106: error: 'acpi_gbl_FADT' undeclared (first use in this function)
Fixing that one gives:
ERROR: "backlight_device_register" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "lock_fb_info" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "backlight_device_unregister" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "num_registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
ERROR: "fb_blank" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
Signed-off-by: Randy Dunlap <[email protected]>
Cc: Greg Kroah-Hartman <[email protected]>
Cc: Andres Salomon <[email protected]>
Cc: Chris Ball <[email protected]>
Cc: Jon Nettleton <[email protected]>
---
drivers/staging/olpc_dcon/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- linux-next-20110221.orig/drivers/staging/olpc_dcon/Kconfig
+++ linux-next-20110221/drivers/staging/olpc_dcon/Kconfig
@@ -1,6 +1,6 @@
config FB_OLPC_DCON
tristate "One Laptop Per Child Display CONtroller support"
- depends on OLPC
+ depends on OLPC && FB
select I2C
---help---
Add support for the OLPC XO DCON controller. This controller is
@@ -19,7 +19,7 @@ config FB_OLPC_DCON_1
config FB_OLPC_DCON_1_5
bool "OLPC XO-1.5 DCON support"
- depends on FB_OLPC_DCON
+ depends on FB_OLPC_DCON && ACPI
default y
---help---
Enable support for the DCON in XO-1.5 model laptops. The kernel
Looks correct, thanks!
Acked-By: Andres Salomon <[email protected]>
On Mon, 21 Feb 2011
14:39:08 -0800 Randy Dunlap <[email protected]> wrote:
> From: Randy Dunlap <[email protected]>
>
> drivers/staging/olpc_dcon/olpc_dcon_xo_1_5.c:106: error:
> 'acpi_gbl_FADT' undeclared (first use in this function)
>
> Fixing that one gives:
>
> ERROR:
> "backlight_device_register" [drivers/staging/olpc_dcon/olpc-dcon.ko]
> undefined! ERROR:
> "registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko] undefined!
> ERROR: "lock_fb_info" [drivers/staging/olpc_dcon/olpc-dcon.ko]
> undefined! ERROR:
> "backlight_device_unregister" [drivers/staging/olpc_dcon/olpc-dcon.ko]
> undefined! ERROR:
> "num_registered_fb" [drivers/staging/olpc_dcon/olpc-dcon.ko]
> undefined! ERROR: "fb_blank" [drivers/staging/olpc_dcon/olpc-dcon.ko]
> undefined!
>
> Signed-off-by: Randy Dunlap <[email protected]>
> Cc: Greg Kroah-Hartman <[email protected]>
> Cc: Andres Salomon <[email protected]>
> Cc: Chris Ball <[email protected]>
> Cc: Jon Nettleton <[email protected]>
> ---
> drivers/staging/olpc_dcon/Kconfig | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> --- linux-next-20110221.orig/drivers/staging/olpc_dcon/Kconfig
> +++ linux-next-20110221/drivers/staging/olpc_dcon/Kconfig
> @@ -1,6 +1,6 @@
> config FB_OLPC_DCON
> tristate "One Laptop Per Child Display CONtroller support"
> - depends on OLPC
> + depends on OLPC && FB
> select I2C
> ---help---
> Add support for the OLPC XO DCON controller. This
> controller is @@ -19,7 +19,7 @@ config FB_OLPC_DCON_1
>
> config FB_OLPC_DCON_1_5
> bool "OLPC XO-1.5 DCON support"
> - depends on FB_OLPC_DCON
> + depends on FB_OLPC_DCON && ACPI
> default y
> ---help---
> Enable support for the DCON in XO-1.5 model laptops. The
> kernel
On Mon, 21 Feb 2011 21:30:01 +0100 Rafael J. Wysocki wrote:
> On Monday, February 21, 2011, Randy Dunlap wrote:
> > On Mon, 21 Feb 2011 18:21:34 +1100 Stephen Rothwell wrote:
> >
> > > Hi all,
> > >
> > > Changes since 20110218:
> >
> >
> > When CONFIG_PM_RUNTIME is not enabled:
> >
> > drivers/usb/serial/usb_wwan.c:702: error: 'struct dev_pm_info' has no member named 'usage_count'
>
> This looks like a bug in the driver that shouldn't access this field directly.
This build error is still with us in linux-next 2011.0303.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***
On Thu, 3 Mar 2011, Randy Dunlap wrote:
> On Mon, 21 Feb 2011 21:30:01 +0100 Rafael J. Wysocki wrote:
>
> > On Monday, February 21, 2011, Randy Dunlap wrote:
> > > On Mon, 21 Feb 2011 18:21:34 +1100 Stephen Rothwell wrote:
> > >
> > > > Hi all,
> > > >
> > > > Changes since 20110218:
> > >
> > >
> > > When CONFIG_PM_RUNTIME is not enabled:
> > >
> > > drivers/usb/serial/usb_wwan.c:702: error: 'struct dev_pm_info' has no member named 'usage_count'
> >
> > This looks like a bug in the driver that shouldn't access this field directly.
>
>
> This build error is still with us in linux-next 2011.0303.
Since Oliver added this bug in commit
16871dcac74c63227aa92e0012f3004a648c2062 (usb_wwan: error case of
resume), he should be the person to fix it. The logic there is not
clear to me; I don't know how it ought to be changed. Would replacing
it with a call to usb_autopm_put_interface_no_suspend() be good enough?
Alan Stern
On Fri, 4 Mar 2011 10:04:38 -0500 (EST) Alan Stern wrote:
> On Thu, 3 Mar 2011, Randy Dunlap wrote:
>
> > On Mon, 21 Feb 2011 21:30:01 +0100 Rafael J. Wysocki wrote:
> >
> > > On Monday, February 21, 2011, Randy Dunlap wrote:
> > > > On Mon, 21 Feb 2011 18:21:34 +1100 Stephen Rothwell wrote:
> > > >
> > > > > Hi all,
> > > > >
> > > > > Changes since 20110218:
> > > >
> > > >
> > > > When CONFIG_PM_RUNTIME is not enabled:
> > > >
> > > > drivers/usb/serial/usb_wwan.c:702: error: 'struct dev_pm_info' has no member named 'usage_count'
> > >
> > > This looks like a bug in the driver that shouldn't access this field directly.
> >
> >
> > This build error is still with us in linux-next 2011.0303.
>
> Since Oliver added this bug in commit
> 16871dcac74c63227aa92e0012f3004a648c2062 (usb_wwan: error case of
> resume), he should be the person to fix it. The logic there is not
> clear to me; I don't know how it ought to be changed. Would replacing
> it with a call to usb_autopm_put_interface_no_suspend() be good enough?
Hi Oliver,
This build problem still happens with linux-next 2011.0315.
Please send a fix for it.
---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***