linux-next: Tree for June 11

linux-next: Tree for June 11

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 9914 bytes --]

Hi all,

Changes since next-20080610:

Dropped trees (temporary): ldp (it is unfetchable - probably something to
do with the new Staging tree), block (it just has too many conflicts and
breaks the powerpc build).

The kbuild-current tree is now itself again.

The kbuild tree fixed it build problem.

The usb tree lost its hid build problem.

The tip-core tree lost its conflict (since the kbuild tree effectively
moved).

The x86 tree gained two conflicts with the ftrace tree.

The pci tree lost its conflict with the kbuild-current tree but gained
one with the x86 tree and one with the driver-core tree.

The hid tree lost its conflict with the driver-core tree.

The nsfd tree gained a conflict with the cpus4096 tree.

The powerpc tree was fixed up so that it no longer needed a commit
reverted.

The net tree lost its conflict with the net-current tree.

The galak tree gained a conflict with the net tree.

The wireless tree lost all its conflicts.

The rr tree gained a conflict with the net-current tree.

I have applied the following temporary patch for known build problems:

	"Fix various 8390 builds" - the net tree broke builds on various
architectures - hopefully this patch will go into the net tree shortly.

The powerpc64 allyesconfig build is broken, probably by ftrace.
The sparc32 defconfig build is broken, probably by the kbuild tree.

----------------------------------------------------------------------------

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, 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 92 trees (counting Linus' and 13 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                    sfr@canb.auug.org.au

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging powerpc-merge/merge
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sparc-current/master
Merging sound-current/for-linus
Merging arm-current/master
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 quilt/driver-core
Merging quilt/usb
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
Applying ftrace: fix rculist split fallout
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/x86/kernel/process_32.c
CONFLICT (content): Merge conflict in arch/x86/kernel/process_64.c
Merging pci/linux-next
CONFLICT (content): Merge conflict in arch/x86/pci/irq.c
CONFLICT (content): Merge conflict in drivers/base/power/main.c
CONFLICT (content): Merge conflict in drivers/pci/hotplug/fakephp.c
CONFLICT (content): Merge conflict in include/linux/device.h
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/i2c-core.c
Merging quilt/kernel-doc
Merging avr32/avr32-arch
Merging v4l-dvb/stable
Merging s390/features
CONFLICT (content): Merge conflict in drivers/s390/block/dasd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_eckd.c
CONFLICT (content): Merge conflict in drivers/s390/block/dasd_fba.c
CONFLICT (content): Merge conflict in drivers/s390/char/tape_core.c
CONFLICT (content): Merge conflict in drivers/s390/cio/device_fsm.c
CONFLICT (content): Merge conflict in drivers/s390/net/claw.c
CONFLICT (content): Merge conflict in drivers/s390/net/ctcm_main.c
CONFLICT (content): Merge conflict in drivers/s390/net/lcs.c
Merging sh/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 blackfin/for-linus
Merging nfsd/nfsd-next
CONFLICT (content): Merge conflict in net/sunrpc/svc.c
Merging ieee1394/for-next
Merging hwmon/testing
Merging ubi/master
Merging kvm/master
Merging dlm/next
Merging scsi/master
Applying scsi: fix fallout from the class_find_device API change
Applying scsi: fix fallout from KOBJ_NAME_LEN removal
Merging ia64/test
Merging tests/master
CONFLICT (content): Merge conflict in lib/Kconfig.debug
Merging ocfs2/linux-next
Merging selinux/for-akpm
Merging quilt/m68k
Merging powerpc/powerpc-next
CONFLICT (delete/modify): arch/ppc/platforms/cpci690.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/cpci690.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/ev64260.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/ev64260.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/ev64360.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/ev64360.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/hdpu.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/hdpu.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/katana.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/katana.c left in tree.
CONFLICT (delete/modify): arch/ppc/platforms/radstone_ppc7d.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/platforms/radstone_ppc7d.c left in tree.
CONFLICT (delete/modify): arch/ppc/syslib/ppc_sys.c deleted in powerpc/powerpc-next and modified in HEAD. Version HEAD of arch/ppc/syslib/ppc_sys.c left in tree.
Merging lblnet/master
Merging ext4/next
Merging 4xx/next
Merging async_tx/next
Merging udf/for_next
Merging security-testing/next
Merging net/master
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Merging sparc/master
Merging galak/powerpc-next
CONFLICT (content): Merge conflict in Documentation/powerpc/booting-without-of.txt
Merging mtd/master
Merging wireless/master
Merging crypto/master
Merging vfs/vfs-2.6.25
Merging sound/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/board-yl-9200.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/tosa.c
Merging cpufreq/next
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq.c
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
Merging cifs/master
Merging mmc/next
CONFLICT (content): Merge conflict in drivers/mmc/host/mmc_spi.c
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging semaphore-removal/semaphore-removal
CONFLICT (content): Merge conflict in drivers/net/ps3_gelic_wireless.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_attr.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_def.h
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mbx.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_mid.c
CONFLICT (content): Merge conflict in drivers/scsi/qla2xxx/qla_os.c
Merging bkl-removal/bkl-removal
Merging trivial/next
Merging ubifs/for_andrew
Merging lsm/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in drivers/usb/misc/isight_firmware.c
CONFLICT (content): Merge conflict in drivers/usb/serial/Kconfig
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_3410.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_3410.h left in tree.
CONFLICT (delete/modify): drivers/usb/serial/ti_fw_5052.h deleted in firmware/master and modified in HEAD. Version HEAD of drivers/usb/serial/ti_fw_5052.h left in tree.
CONFLICT (content): Merge conflict in drivers/usb/serial/ti_usb_3410_5052.c
CONFLICT (content): Merge conflict in sound/pci/Kconfig
CONFLICT (content): Merge conflict in sound/pci/maestro3.c
CONFLICT (content): Merge conflict in sound/pci/ymfpci/ymfpci_main.c
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
CONFLICT (content): Merge conflict in drivers/video/backlight/Kconfig
CONFLICT (content): Merge conflict in drivers/video/backlight/Makefile
Applying Fix various 8390 builds

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

Re: linux-next: Tree for June 11

[Greg KH]

On Wed, Jun 11, 2008 at 07:38:40PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since next-20080610:
> 
> Dropped trees (temporary): ldp (it is unfetchable - probably something to
> do with the new Staging tree), block (it just has too many conflicts and
> breaks the powerpc build).

Yes, I've dropped "ldp" from my 'gregkh' set of patches/trees, they
should be pulled in from the -staging tree, which would be great if you
could add to the end of the -next tree.

I've also removed some of the larger patches in the driver-core tree
that were causing you merge/build errors, they should be all resolved
now.

thanks,

greg k-h

Re: linux-next: Tree for June 11

[Kevin Winchester]

Stephen Rothwell wrote:
> Hi all,
> 
> Changes since next-20080610:
> 
> Dropped trees (temporary): ldp (it is unfetchable - probably something to
> do with the new Staging tree), block (it just has too many conflicts and
> breaks the powerpc build).
> 
> The kbuild-current tree is now itself again.
> 
> The kbuild tree fixed it build problem.
> 
> The usb tree lost its hid build problem.
> 
> The tip-core tree lost its conflict (since the kbuild tree effectively
> moved).
> 
> The x86 tree gained two conflicts with the ftrace tree.
> 
> The pci tree lost its conflict with the kbuild-current tree but gained
> one with the x86 tree and one with the driver-core tree.
> 
> The hid tree lost its conflict with the driver-core tree.
> 
> The nsfd tree gained a conflict with the cpus4096 tree.
> 
> The powerpc tree was fixed up so that it no longer needed a commit
> reverted.
> 
> The net tree lost its conflict with the net-current tree.
> 
> The galak tree gained a conflict with the net tree.
> 
> The wireless tree lost all its conflicts.
> 
> The rr tree gained a conflict with the net-current tree.
> 
> I have applied the following temporary patch for known build problems:
> 
> 	"Fix various 8390 builds" - the net tree broke builds on various
> architectures - hopefully this patch will go into the net tree shortly.
> 
> The powerpc64 allyesconfig build is broken, probably by ftrace.
> The sparc32 defconfig build is broken, probably by the kbuild tree.
> 

I see a problem with this tree (and possibly with ones from previous 
days - I haven't tested next in 2-3 days or so).  I have no direct 
rendering as reported by glxinfo, whereas with Linus' latest tree I do.

I checked my logs and I see:


PCI: Using ACPI for IRQ routing
PCI: Cannot allocate resource region 0 of device 0000:00:00.0
agpgart: Detected AGP bridge 0
agpgart: Aperture conflicts with PCI mapping.
agpgart: Aperture from AGP @ e0000000 size 128 MB
agpgart: Aperture conflicts with PCI mapping.
agpgart: No usable aperture found.
agpgart: Consider rebooting with iommu=memaper=2 to get a good aperture.


In a working kernel, all I see is:

PCI: Using ACPI for IRQ routing
agpgart: Detected AGP bridge 0
agpgart: Aperture from AGP @ e0000000 size 128 MB

Does anyone have any idea where I would start to look for the cause? 
Would it be a PCI problem?  An AGP problem?  An x86 problem?

If necessary I can bisect, but 12-13 compile-boot cycles will take me a 
few evenings worth of computer time.  A targeted revert or two to try 
would help.

Thanks,

-- 
Kevin Winchester

linux-next: Tree for June 11

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 9487 bytes --]

Hi all,

Changes since 20090610:

Removed tree: voyager (while it is being reorganised)

These trees: x86, tip-core, cpus4096, tracing, genirq,
safe-poison-pointers, sched, stackprotector, timers, generic-ipi,
oprofile, fastboot, sparseirq, iommu, kmemcheck have been replaced by a
single tree (tip) that is a merge of them.

This tree fails to build for powerpc allyesconfig.

The vfs tree lost its boot failure.

The rr tree lost its conflicts, but gained a build failure for which I
applied a patch.

The block tree lost 2 conflicts.

The tip tree lost 5 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 129 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                    sfr@canb.auug.org.au

$ 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
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/viper.c
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging configfs/linux-next
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
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/ext4/super.c
CONFLICT (delete/modify): fs/gfs2/ops_super.c deleted in HEAD and modified in vfs/for-next. Version vfs/for-next of fs/gfs2/ops_super.c left in tree.
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
$ git rm -f fs/gfs2/ops_super.c
Applying: vfs/gfs2: fixup merge for file removal
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
Merging quota/for_next
Merging kbuild/master
Merging ide/for-next
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/platform/x86/Kconfig
CONFLICT (content): Merge conflict in drivers/platform/x86/toshiba_acpi.c
CONFLICT (content): Merge conflict in drivers/scsi/fcoe/fcoe.c
CONFLICT (content): Merge conflict in include/linux/mmc/sdio_ids.h
Merging wireless/master
[master 9c68a92] Revert "Merge branch 'oqo-wmi-EXPECT-REFRESH' into test"
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/cpufreq/speedstep-centrino.c
Merging cifs/master
Merging mmc/next
Merging input/next
Merging bkl-removal/bkl-removal
Merging lsm/for-next
Merging block/for-next
CONFLICT (content): Merge conflict in drivers/ide/ide-atapi.c
CONFLICT (content): Merge conflict in drivers/ide/ide-cd.c
CONFLICT (content): Merge conflict in drivers/ide/ide-floppy.c
CONFLICT (content): Merge conflict in drivers/ide/ide-tape.c
CONFLICT (content): Merge conflict in drivers/message/fusion/mptsas.c
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
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 Documentation/feature-removal-schedule.txt
CONFLICT (content): Merge conflict in arch/x86/include/asm/mce.h
CONFLICT (content): Merge conflict in block/blk-sysfs.c
CONFLICT (content): Merge conflict in net/core/drop_monitor.c
CONFLICT (content): Merge conflict in net/core/net-traces.c
Merging kmemleak/kmemleak
CONFLICT (delete/modify): arch/x86/kernel/vmlinux_32.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_32.lds.S left in tree.
CONFLICT (delete/modify): arch/x86/kernel/vmlinux_64.lds.S deleted in HEAD and modified in kmemleak/kmemleak. Version kmemleak/kmemleak of arch/x86/kernel/vmlinux_64.lds.S left in tree.
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
$ git rm -f arch/x86/kernel/vmlinux_32.lds.S arch/x86/kernel/vmlinux_64.lds.S
Merging asm-generic/next
CONFLICT (content): Merge conflict in arch/arm/include/asm/page.h
Merging quilt/driver-core
CONFLICT (content): Merge conflict in arch/x86/kernel/microcode_core.c
CONFLICT (content): Merge conflict in drivers/base/firmware_class.c
CONFLICT (content): Merge conflict in drivers/scsi/ibmvscsi/ibmvscsi.c
CONFLICT (content): Merge conflict in init/main.c
Merging quilt/usb
CONFLICT (content): Merge conflict in drivers/usb/class/cdc-acm.c
CONFLICT (content): Merge conflict in drivers/usb/serial/cp210x.c
CONFLICT (content): Merge conflict in drivers/usb/serial/ftdi_sio.c
CONFLICT (content): Merge conflict in drivers/usb/serial/kobil_sct.c
CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/rt2860/common/mlme.c
CONFLICT (content): Merge conflict in drivers/staging/rt2870/common/mlme.c
CONFLICT (content): Merge conflict in drivers/staging/rt3070/common/mlme.c
Merging scsi-post-merge/master
CONFLICT (content): Merge conflict in include/Kbuild
Applying: rr: fix up for sparc32 extable

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

linux-next: Tree for June 11

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 8007 bytes --]

Hi all,

Changes since 20100610:

My fixes tree contains:
      v4l-dvb: update gfp/slab.h includes
      arm: update gfp/slab.h includes
      davinci: update gfp/slab.h includes
      ocfs2: update gfp/slab.h includes
      acpi: update gfp/slab.h includes

The kbuild-current tree lost its build failure.

----------------------------------------------------------------------------

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 164 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                    sfr@canb.auug.org.au

$ 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 gcl-current/merge
Merging arm/devel
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
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
CONFLICT (content): Merge conflict in drivers/serial/mpc52xx_uart.c
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
CONFLICT (content): Merge conflict in include/linux/serial_sci.h
Merging sparc/master
Merging tile/master
Merging xtensa/master
Merging ceph/for-next
Merging cifs/master
Merging configfs/linux-next
Merging ecryptfs/next
CONFLICT (content): Merge conflict in fs/ecryptfs/main.c
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 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
CONFLICT (content): Merge conflict in arch/arm/plat-omap/i2c.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-cpm.c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
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 idle-test/idle-test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
Merging ibft/master
Merging swiotlb/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271.h
CONFLICT (content): Merge conflict in drivers/net/wireless/wl12xx/wl1271_cmd.h
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in kernel/module.c
Merging mmc/next
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
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/evergreen.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/r600.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_combios.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/radeon_pm.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/radeon/rv770.c
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
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (delete/modify): fs/notify/inotify/inotify.c deleted in fsnotify/for-next and modified in HEAD. Version HEAD of fs/notify/inotify/inotify.c left in tree.
$ git rm -f fs/notify/inotify/inotify.c
Applying: fsnotify: update gfp/slab.h includes
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging drbd/for-jens
CONFLICT (content): Merge conflict in fs/fs-writeback.c
CONFLICT (content): Merge conflict in include/linux/drbd.h
Merging catalin/for-next
Merging alacrity/linux-next
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging omap_dss2/for-next
Merging tip/auto-latest
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
Merging quilt/usb
Merging staging-next/staging-next
Merging slabh/slabh
Merging scsi-post-merge/master

[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]

Re: linux-next: Tree for June 11

[Andrew Morton]

On Fri, 11 Jun 2010 14:17:38 +1000
Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> 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/ ).

Rusty broke your kernel!

oops: http://userweb.kernel.org/~akpm/IMG_20100611_155611.jpg

config: http://userweb.kernel.org/~akpm/stuff/config-akpm2-small.txt

(gdb) l *0xffffffff8105f9fb
0xffffffff8105f9fb is in get_ksymbol (kernel/module.c:2784).
2779                    if (mod->symtab[i].st_shndx == SHN_UNDEF)
2780                            continue;
2781    
2782                    /* We ignore unnamed symbols: they're uninformative
2783                     * and inserted at a whim. */
2784                    if (mod->symtab[i].st_value <= addr
2785                        && mod->symtab[i].st_value > mod->symtab[best].st_value
2786                        && *(mod->strtab + mod->symtab[i].st_name) != '\0'
2787                        && !is_arm_mapping_symbol(mod->strtab + mod->symtab[i].st_name))
2788                            best = i;

Current mainline is OK.

<someone broke netconsole too, I think...>

Re: linux-next: Tree for June 11

[Rusty Russell]

On Sat, 12 Jun 2010 09:01:24 am Andrew Morton wrote:
> On Fri, 11 Jun 2010 14:17:38 +1000
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > 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/ ).
> 
> Rusty broke your kernel!
> 
> oops: http://userweb.kernel.org/~akpm/IMG_20100611_155611.jpg
> 
> config: http://userweb.kernel.org/~akpm/stuff/config-akpm2-small.txt
> 
> (gdb) l *0xffffffff8105f9fb
> 0xffffffff8105f9fb is in get_ksymbol (kernel/module.c:2784).
> 2779                    if (mod->symtab[i].st_shndx == SHN_UNDEF)
> 2780                            continue;
> 2781    
> 2782                    /* We ignore unnamed symbols: they're uninformative
> 2783                     * and inserted at a whim. */
> 2784                    if (mod->symtab[i].st_value <= addr
> 2785                        && mod->symtab[i].st_value > mod->symtab[best].st_value
> 2786                        && *(mod->strtab + mod->symtab[i].st_name) != '\0'
> 2787                        && !is_arm_mapping_symbol(mod->strtab + mod->symtab[i].st_name))
> 2788                            best = i;

Hmm, I can't reproduce this :(  I'm only 32 bit here, have to dig out my
64-bit machine tomorrow.

One wonders why we're in get_ksymbol at all.  Has something already gone
horribly wrong?

Rusty.

Re: linux-next: Tree for June 11

[Andrew Morton]

On Tue, 15 Jun 2010 18:56:37 +0930 Rusty Russell <rusty@rustcorp.com.au> wrote:

> On Sat, 12 Jun 2010 09:01:24 am Andrew Morton wrote:
> > On Fri, 11 Jun 2010 14:17:38 +1000
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > 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/ ).
> > 
> > Rusty broke your kernel!
> > 
> > oops: http://userweb.kernel.org/~akpm/IMG_20100611_155611.jpg
> > 
> > config: http://userweb.kernel.org/~akpm/stuff/config-akpm2-small.txt
> > 
> > (gdb) l *0xffffffff8105f9fb
> > 0xffffffff8105f9fb is in get_ksymbol (kernel/module.c:2784).
> > 2779                    if (mod->symtab[i].st_shndx == SHN_UNDEF)
> > 2780                            continue;
> > 2781    
> > 2782                    /* We ignore unnamed symbols: they're uninformative
> > 2783                     * and inserted at a whim. */
> > 2784                    if (mod->symtab[i].st_value <= addr
> > 2785                        && mod->symtab[i].st_value > mod->symtab[best].st_value
> > 2786                        && *(mod->strtab + mod->symtab[i].st_name) != '\0'
> > 2787                        && !is_arm_mapping_symbol(mod->strtab + mod->symtab[i].st_name))
> > 2788                            best = i;
> 
> Hmm, I can't reproduce this :(

I haven't seen any reports from any other linux-next users either, so
I'm special.

>  I'm only 32 bit here, have to dig out my
> 64-bit machine tomorrow.
> 
> One wonders why we're in get_ksymbol at all.  Has something already gone
> horribly wrong?

Nothing that I'm aware of.  I guess I won't be getting a very good
trace if the trace uses get_ksymbol().

If it's still happening I'll debug it a bit.  Need to find out why
netconsole went awol.

Re: linux-next: Tree for June 11

[Andrew Morton]

On Tue, 15 Jun 2010 18:56:37 +0930
Rusty Russell <rusty@rustcorp.com.au> wrote:

> On Sat, 12 Jun 2010 09:01:24 am Andrew Morton wrote:
> > On Fri, 11 Jun 2010 14:17:38 +1000
> > Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> > 
> > > 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/ ).
> > 
> > Rusty broke your kernel!
> > 
> > oops: http://userweb.kernel.org/~akpm/IMG_20100611_155611.jpg
> > 
> > config: http://userweb.kernel.org/~akpm/stuff/config-akpm2-small.txt
> > 
> > (gdb) l *0xffffffff8105f9fb
> > 0xffffffff8105f9fb is in get_ksymbol (kernel/module.c:2784).
> > 2779                    if (mod->symtab[i].st_shndx == SHN_UNDEF)
> > 2780                            continue;
> > 2781    
> > 2782                    /* We ignore unnamed symbols: they're uninformative
> > 2783                     * and inserted at a whim. */
> > 2784                    if (mod->symtab[i].st_value <= addr
> > 2785                        && mod->symtab[i].st_value > mod->symtab[best].st_value
> > 2786                        && *(mod->strtab + mod->symtab[i].st_name) != '\0'
> > 2787                        && !is_arm_mapping_symbol(mod->strtab + mod->symtab[i].st_name))
> > 2788                            best = i;
> 
> Hmm, I can't reproduce this :(  I'm only 32 bit here, have to dig out my
> 64-bit machine tomorrow.
> 
> One wonders why we're in get_ksymbol at all.  Has something already gone
> horribly wrong?

Dunno - maybe it got into get_ksymbol() because something oopsed, and
oops tracing uses get_ksymbol().  There's no stack trace because stack
tracing uses get_ksymbol().

Anyway I retested next-20100623 and the verdict is ... you still suck!

I bisected it down to 4624469822455b4accc886557f6c997ccdd59066
("module: kallsyms functions take struct load_info").  I couldn't see
anything obviously wrong with it, but there's something screwy in
there..

<mooches off to bisect Yet Another Hang>

Re: linux-next: Tree for June 11

[Rusty Russell]

On Thu, 24 Jun 2010 08:23:03 am Andrew Morton wrote:
> I bisected it down to 4624469822455b4accc886557f6c997ccdd59066
> ("module: kallsyms functions take struct load_info").  I couldn't see
> anything obviously wrong with it, but there's something screwy in
> there..

Great, thanks for bisecting.  I'll wrangle with it a little and see
if I can figure out what screwed up.

Thanks,
Rusty.