Subject: Re: linux-next: Tree for December 17

From: "Paul E. McKenney" <[email-masked]>
Date: Fri, 17 Dec 2010 11:44:13 -0800

On Fri, Dec 17, 2010 at 05:32:37PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> [The mirroring on kernel.org is running slowly]
> 
> Changes since 20101216:
> 
> The vfs-scale tree gained a conflict against the hfsplus tree.
> 
> The wireless tree lost its build failure.
> 
> The block tree gained a conflict against the scsi tree.
> 
> The offending commit was removed from the rcu tree.

And a fixed (and tested, for a change) commit has been added back in.  ;-)

							Thanx, Paul

> The tty tree gained a build failure so I reverted a commit.
> 
> The usb tree lost 3 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 183 trees (counting Linus' and 26 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-masked]
> 
> $ 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 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 gcl-current/merge
> Merging arm/devel
> CONFLICT (content): Merge conflict in arch/arm/Kconfig
> Merging davinci/davinci-next
> Merging i.MX/for-next
> Merging linux-spec/for-next
> Merging msm/for-next
> 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
> 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/sh-latest
> Merging rmobile/rmobile-latest
> CONFLICT (content): Merge conflict in arch/arm/mach-shmobile/Kconfig
> Applying: rmobile: merge fixup for clkdev changes
> 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 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
> CONFLICT (content): Merge conflict in fs/cifs/dir.c
> CONFLICT (content): Merge conflict in fs/fuse/inode.c
> CONFLICT (content): Merge conflict in fs/hfsplus/hfsplus_fs.h
> CONFLICT (content): Merge conflict in fs/hfsplus/unicode.c
> 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
> 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 swiotlb/master
> Merging ibft/master
> Merging scsi/master
> Merging async_tx/next
> Merging net/master
> CONFLICT (content): Merge conflict in drivers/net/bnx2x/bnx2x.h
> CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-1000.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-6000.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h
> CONFLICT (content): Merge conflict in drivers/vhost/vhost.c
> CONFLICT (content): Merge conflict in net/9p/protocol.c
> Merging wireless/master
> CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-1000.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-6000.c
> CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h
> Merging bluetooth/master
> CONFLICT (content): Merge conflict in net/bluetooth/Makefile
> Merging mtd/master
> Merging crypto/master
> Merging sound/for-next
> Merging sound-asoc/for-next
> Merging cpufreq/next
> Merging quilt/rr
> Merging input/next
> CONFLICT (content): Merge conflict in include/linux/input.h
> Merging lsm/for-next
> Merging block/for-next
> CONFLICT (content): Merge conflict in drivers/scsi/sd.c
> 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
> CONFLICT (content): Merge conflict in drivers/mfd/wm8994-core.c
> Merging hdlc/hdlc-next
> Merging drm/drm-next
> Merging fbdev/master
> Merging viafb/viafb-next
> Merging omap_dss2/for-next
> Merging voltage/for-next
> CONFLICT (content): Merge conflict in drivers/regulator/core.c
> CONFLICT (content): Merge conflict in drivers/regulator/mc13783-regulator.c
> 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
> CONFLICT (content): Merge conflict in arch/arm/mach-omap2/pm24xx.c
> CONFLICT (content): Merge conflict in drivers/scsi/bfa/bfa_fcpim.c
> 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/next-devicetree
> Merging spi/next-spi
> Merging tip/auto-latest
> Merging rcu/rcu/next
> Merging oprofile/for-next
> Merging xen/upstream/xen
> Merging swiotlb-xen/master
> CONFLICT (content): Merge conflict in drivers/xen/Kconfig
> CONFLICT (content): Merge conflict in drivers/xen/Makefile
> Merging xen-pvhvm/linux-next
> Merging edac-amd/for-next
> Merging percpu/for-next
> CONFLICT (delete/modify): arch/x86/kernel/apic/nmi.c deleted in HEAD and modified in percpu/for-next. Version percpu/for-next of arch/x86/kernel/apic/nmi.c left in tree.
> $ git rm -f arch/x86/kernel/apic/nmi.c
> Merging workqueues/for-next
> CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
> Merging sfi/sfi-test
> Merging asm-generic/next
> Merging drivers-x86/linux-next
> Merging hwpoison/hwpoison
> Merging sysctl/master
> Merging driver-core/driver-core-next
> Merging tty/tty-next
> Merging usb/usb-next
> CONFLICT (content): Merge conflict in arch/sh/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 include/linux/hardirq.h
> CONFLICT (content): Merge conflict in include/linux/smp_lock.h
> 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
> [master e0d72df] Revert "drivers: serial: apbuart: Handle OF failures gracefully"