linux-next: Tree for July 15

linux-next: Tree for July 15

[Stephen Rothwell]

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

Hi all,

Changes since 20090714:

Undropped trees: usb, staging

This tree fails to build for powerpc allyesconfig (final link problem).

The pci tree gained a build failure so I used the version from
next-20090714.

The dwmw2-iommu tree gained a build failure so I used the version from
next-20090714.

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

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 132 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 davinci/for-next
Merging pxa/for-next
Merging thumb-2/thumb-2
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 arch/mips/cavium-octeon/dma-octeon.c
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
CONFLICT (add/add): Merge conflict in drivers/dma/txx9dmac.c
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/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/journal.c
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
Merging vfs/for-next
Merging pci/linux-next
$ git reset --hard HEAD^
Merging refs/next/20090714/pci
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/master
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/net/wireless/orinoco/main.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
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
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c
CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c
CONFLICT (content): Merge conflict in drivers/usb/serial/sierra.c
$ git reset --hard HEAD^
Merging refs/next/20090713/ttydev
CONFLICT (content): Merge conflict in drivers/usb/serial/generic.c
CONFLICT (content): Merge conflict in drivers/usb/serial/pl2303.c
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
$ git reset --hard HEAD^
Merging refs/next/20090714/dwmw2-iommu
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 hwlat/for-linus
Merging tip/auto-latest
CONFLICT (content): Merge conflict in drivers/oprofile/oprofile_stats.c
CONFLICT (content): Merge conflict in include/linux/rcupdate.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/sh/kernel/vmlinux.lds.S
CONFLICT (content): Merge conflict in arch/x86/kernel/cpu/perf_counter.c
CONFLICT (content): Merge conflict in drivers/cpufreq/cpufreq_ondemand.c
Merging sfi/sfi-test
Merging asm-generic/next
Merging quilt/driver-core
CONFLICT (content): Merge conflict in init/main.c
Applying: driver-core: fix for mtd typo
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master

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

Re: linux-next: Tree for July 15 (bdi warning)

[Bartlomiej Zolnierkiewicz]

On Wednesday 15 July 2009 08:18:41 Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20090714:

Jens, I see the following warning sometimes during disconnect
of usb-storage device, is this anything to be worried about?

------------[ cut here ]------------
WARNING: at mm/backing-dev.c:787 bdi_destroy+0x1e/0x4d()
Hardware name: Extensa 2900
Modules linked in: nls_iso8859_1 nls_cp437 vfat fat usb_storage radeon sco bnep l2cap bluetooth rfkill lib80211_crypt_tkip xt_state ipt_MASQUERADE iptable_nat nf_nat nf_conntrack_ipv4 nf_conntrack nf_defrag_ipv4 acerhk binfmt_misc uinput snd_intel8x0m snd_intel8x0 snd_ac97_codec ipw2200 ac97_bus snd_pcm snd_timer libipw snd soundcore uhci_hcd ehci_hcd parport_pc snd_page_alloc lib80211 parport [last unloaded: scsi_wait_scan]
Pid: 183, comm: khubd Tainted: G   M       2.6.31-rc3-next-20090715-03649-g2a49c7b #23
Call Trace:
 [<c0129db9>] warn_slowpath_common+0x65/0x7c
 [<c01705c7>] ? bdi_destroy+0x1e/0x4d
 [<c0129ddd>] warn_slowpath_null+0xd/0x10
 [<c01705c7>] bdi_destroy+0x1e/0x4d
 [<c0229d3d>] blk_release_queue+0x38/0x47
 [<c0233f10>] kobject_release+0x3f/0x4f
 [<c0233ed1>] ? kobject_release+0x0/0x4f
 [<c02349c1>] kref_put+0x39/0x42
 [<c0233e4d>] kobject_put+0x37/0x3c
 [<c02285cb>] blk_put_queue+0xd/0xf
 [<c0228747>] blk_cleanup_queue+0x3d/0x41
 [<c02b9713>] scsi_free_queue+0x8/0xa
 [<c02bd0f9>] scsi_device_dev_release_usercontext+0xf6/0x12c
 [<c02bd003>] ? scsi_device_dev_release_usercontext+0x0/0x12c
 [<c0137c3c>] execute_in_process_context+0x1d/0x5b
 [<c02bd001>] scsi_device_dev_release+0x13/0x15
 [<c02ae690>] device_release+0x35/0x5a
 [<c0233f10>] kobject_release+0x3f/0x4f
 [<c0233ed1>] ? kobject_release+0x0/0x4f
 [<c02349c1>] kref_put+0x39/0x42
 [<c0233e4d>] kobject_put+0x37/0x3c
 [<c02ae459>] put_device+0xf/0x11
 [<c02bd3df>] __scsi_remove_device+0x61/0x65
 [<c02bb3a8>] scsi_forget_host+0x35/0x51
 [<c02b6544>] scsi_remove_host+0x69/0xcd
 [<e0833684>] quiesce_and_remove_host+0x4c/0x7e [usb_storage]
 [<e083376a>] usb_stor_disconnect+0x13/0x1d [usb_storage]
 [<c02e039f>] usb_unbind_interface+0x3b/0xa0
 [<c02b0c84>] __device_release_driver+0x47/0x7f
 [<c02b0d59>] device_release_driver+0x18/0x23
 [<c02b04bb>] bus_remove_device+0x7f/0x8c
 [<c02af04a>] device_del+0xf0/0x127
 [<c02de6a3>] usb_disable_device+0x61/0xbf
 [<c02dab52>] usb_disconnect+0x7e/0xda
 [<c02db666>] hub_thread+0x30f/0xad5
 [<c013a52d>] ? autoremove_wake_function+0x0/0x2f
 [<c011eca9>] ? complete+0x34/0x3e
 [<c02db357>] ? hub_thread+0x0/0xad5
 [<c013a2f3>] kthread+0x66/0x6b
 [<c013a28d>] ? kthread+0x0/0x6b
 [<c01034eb>] kernel_thread_helper+0x7/0x10
---[ end trace d1600192f6c800d2 ]---

Re: linux-next: Tree for July 15 (bdi warning)

[Jens Axboe]

On Wed, Jul 15 2009, Bartlomiej Zolnierkiewicz wrote:
> On Wednesday 15 July 2009 08:18:41 Stephen Rothwell wrote:
> > Hi all,
> > 
> > Changes since 20090714:
> 
> Jens, I see the following warning sometimes during disconnect
> of usb-storage device, is this anything to be worried about?

Yeah, that should not trigger. It essentially means that the device is
gone, with dirty data still present....

> ------------[ cut here ]------------
> WARNING: at mm/backing-dev.c:787 bdi_destroy+0x1e/0x4d()
> Hardware name: Extensa 2900
> Modules linked in: nls_iso8859_1 nls_cp437 vfat fat usb_storage radeon sco bnep l2cap bluetooth rfkill lib80211_crypt_tkip xt_state ipt_MASQUERADE iptable_nat nf_nat nf_conntrack_ipv4 nf_conntrack nf_defrag_ipv4 acerhk binfmt_misc uinput snd_intel8x0m snd_intel8x0 snd_ac97_codec ipw2200 ac97_bus snd_pcm snd_timer libipw snd soundcore uhci_hcd ehci_hcd parport_pc snd_page_alloc lib80211 parport [last unloaded: scsi_wait_scan]
> Pid: 183, comm: khubd Tainted: G   M       2.6.31-rc3-next-20090715-03649-g2a49c7b #23
> Call Trace:
>  [<c0129db9>] warn_slowpath_common+0x65/0x7c
>  [<c01705c7>] ? bdi_destroy+0x1e/0x4d
>  [<c0129ddd>] warn_slowpath_null+0xd/0x10
>  [<c01705c7>] bdi_destroy+0x1e/0x4d
>  [<c0229d3d>] blk_release_queue+0x38/0x47
>  [<c0233f10>] kobject_release+0x3f/0x4f
>  [<c0233ed1>] ? kobject_release+0x0/0x4f
>  [<c02349c1>] kref_put+0x39/0x42
>  [<c0233e4d>] kobject_put+0x37/0x3c
>  [<c02285cb>] blk_put_queue+0xd/0xf
>  [<c0228747>] blk_cleanup_queue+0x3d/0x41
>  [<c02b9713>] scsi_free_queue+0x8/0xa
>  [<c02bd0f9>] scsi_device_dev_release_usercontext+0xf6/0x12c
>  [<c02bd003>] ? scsi_device_dev_release_usercontext+0x0/0x12c
>  [<c0137c3c>] execute_in_process_context+0x1d/0x5b
>  [<c02bd001>] scsi_device_dev_release+0x13/0x15
>  [<c02ae690>] device_release+0x35/0x5a
>  [<c0233f10>] kobject_release+0x3f/0x4f
>  [<c0233ed1>] ? kobject_release+0x0/0x4f
>  [<c02349c1>] kref_put+0x39/0x42
>  [<c0233e4d>] kobject_put+0x37/0x3c
>  [<c02ae459>] put_device+0xf/0x11
>  [<c02bd3df>] __scsi_remove_device+0x61/0x65
>  [<c02bb3a8>] scsi_forget_host+0x35/0x51
>  [<c02b6544>] scsi_remove_host+0x69/0xcd
>  [<e0833684>] quiesce_and_remove_host+0x4c/0x7e [usb_storage]
>  [<e083376a>] usb_stor_disconnect+0x13/0x1d [usb_storage]
>  [<c02e039f>] usb_unbind_interface+0x3b/0xa0
>  [<c02b0c84>] __device_release_driver+0x47/0x7f
>  [<c02b0d59>] device_release_driver+0x18/0x23
>  [<c02b04bb>] bus_remove_device+0x7f/0x8c
>  [<c02af04a>] device_del+0xf0/0x127
>  [<c02de6a3>] usb_disable_device+0x61/0xbf
>  [<c02dab52>] usb_disconnect+0x7e/0xda
>  [<c02db666>] hub_thread+0x30f/0xad5
>  [<c013a52d>] ? autoremove_wake_function+0x0/0x2f
>  [<c011eca9>] ? complete+0x34/0x3e
>  [<c02db357>] ? hub_thread+0x0/0xad5
>  [<c013a2f3>] kthread+0x66/0x6b
>  [<c013a28d>] ? kthread+0x0/0x6b
>  [<c01034eb>] kernel_thread_helper+0x7/0x10
> ---[ end trace d1600192f6c800d2 ]---

-- 
Jens Axboe