linux-next: Tree for November 20

linux-next: Tree for November 20

[Stephen Rothwell]

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

Hi all,

Changes since 20091119:

The microblaze tree gained a build failure for which I reverted a commit.

The infiniband tree gained a build failure so I used the version from
next-20091119.

The net tree lost all its conflicts and its merge fixup patch.

The edac-amd tree lost its conflict.

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

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 151 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/master
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 arm/devel
Merging davinci/davinci-next
Merging msm/for-next
Merging omap/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-zoom2.c
Merging pxa/for-next
Merging avr32/avr32-arch
CONFLICT (content): Merge conflict in arch/avr32/mach-at32ap/include/mach/cpu.h
Merging blackfin/for-linus
Merging cris/for-next
Merging ia64/test
Merging m68k/for-next
CONFLICT (content): Merge conflict in drivers/rtc/Kconfig
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
Merging sparc/master
Merging xtensa/master
[master 123f757] Revert "Merge of_attach_node"
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 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 reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/common/tuners/tda18271-fe.c
Merging kbuild/master
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
$ git reset --hard HEAD^
Merging refs/next/20091119/infiniband
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
Merging dlm/next
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
Applying: modpost: autoconf.h has moved to include/generated
Merging mmc/next
Merging tmio-mmc/linux-next
Merging input/next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-rx51-peripherals.c
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
CONFLICT (content): Merge conflict in drivers/mtd/maps/pcmciamtd.c
CONFLICT (content): Merge conflict in drivers/net/wireless/ray_cs.c
CONFLICT (content): Merge conflict in drivers/pcmcia/Makefile
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
CONFLICT (content): Merge conflict in drivers/mfd/Kconfig
CONFLICT (content): Merge conflict in drivers/mfd/Makefile
Merging security-testing/next
CONFLICT (content): Merge conflict in Documentation/dontdiff
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 (content): Merge conflict in arch/x86/ia32/ia32entry.S
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_32.h
CONFLICT (content): Merge conflict in arch/x86/include/asm/unistd_64.h
CONFLICT (content): Merge conflict in arch/x86/kernel/syscall_table_32.S
CONFLICT (content): Merge conflict in fs/afs/write.c
CONFLICT (content): Merge conflict in fs/ubifs/file.c
CONFLICT (content): Merge conflict in include/asm-generic/fcntl.h
CONFLICT (content): Merge conflict in net/socket.c
Merging irda/for-next
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in drivers/misc/Makefile
Merging drbd/for-jens
Merging catalin/for-next
Merging alacrity/linux-next
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Applying: i7core_edac: do not export static functions
Merging devicetree/next-devicetree
Merging limits/writable_limits
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/kgdb.c
CONFLICT (content): Merge conflict in kernel/irq/chip.c
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/powerpc/platforms/pseries/hvCall.S
CONFLICT (content): Merge conflict in arch/x86/kvm/svm.c
CONFLICT (content): Merge conflict in kernel/softlockup.c
Applying: percpu: merge fixup for variable renaming
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
CONFLICT (content): Merge conflict in net/ipv6/addrconf.c
Merging quilt/driver-core
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/cb_das16_cs.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_labpc_cs.c
CONFLICT (content): Merge conflict in drivers/staging/comedi/drivers/ni_mio_cs.c
Merging scsi-post-merge/master

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

Re: linux-next: Tree for November 20 (snd_jack)

[Randy Dunlap]

On Fri, 20 Nov 2009 23:05:13 +1100 Stephen Rothwell wrote:

> Hi all,
> 
> Changes since 20091119:


This commit in linux-next-20091120:

author	Mark Brown <broonie@opensource.wolfsonmicro.com>	
	Mon, 28 Jul 2008 18:05:36 +0000 (19:05 +0100)
committer	Jaroslav Kysela <perex@perex.cz>	
	Tue, 29 Jul 2008 19:32:06 +0000 (21:32 +0200)
commit	0d94e41abe271c86df06bcf72d24f9ca7ce771f0

causes build errors when:

CONFIG_INPUT=m
CONFIG_SND=y
CONFIG_SND_JACK=y
CONFIG_SND_SOC=m
CONFIG_SND_HDA_INTEL=m
CONFIG_SND_HDA_INPUT_JACK=y

At least part of the problem is that when a tristate kconfig symbol with
a value of 'm' selects a boolean kconfig symbol, the boolean becomes 'y',
so we end up with
snd-$(CONFIG_SND_JACK)	  += jack.o
being built into the kernel image and INPUT=m, giving:

sound/built-in.o: In function `snd_jack_report':
(.text+0xb5c5): undefined reference to `input_event'
sound/built-in.o: In function `snd_jack_report':
(.text+0xb627): undefined reference to `input_event'
sound/built-in.o: In function `snd_jack_dev_register':
jack.c:(.text+0xb736): undefined reference to `input_register_device'
sound/built-in.o: In function `snd_jack_dev_free':
jack.c:(.text+0xb806): undefined reference to `input_unregister_device'
jack.c:(.text+0xb861): undefined reference to `input_free_device'
sound/built-in.o: In function `snd_jack_new':
(.text+0xb953): undefined reference to `input_allocate_device'
sound/built-in.o: In function `snd_jack_new':
(.text+0xba0d): undefined reference to `input_set_capability'
sound/built-in.o: In function `snd_jack_new':
(.text+0xba2c): undefined reference to `input_free_device'

---
~Randy

Re: linux-next: Tree for November 20 (snd_jack)

[Takashi Iwai]

At Fri, 20 Nov 2009 10:40:30 -0800,
Randy Dunlap wrote:
> 
> On Fri, 20 Nov 2009 23:05:13 +1100 Stephen Rothwell wrote:
> 
> > Hi all,
> > 
> > Changes since 20091119:
> 
> 
> This commit in linux-next-20091120:
> 
> author	Mark Brown <broonie@opensource.wolfsonmicro.com>	
> 	Mon, 28 Jul 2008 18:05:36 +0000 (19:05 +0100)
> committer	Jaroslav Kysela <perex@perex.cz>	
> 	Tue, 29 Jul 2008 19:32:06 +0000 (21:32 +0200)
> commit	0d94e41abe271c86df06bcf72d24f9ca7ce771f0
> 
> causes build errors when:
> 
> CONFIG_INPUT=m
> CONFIG_SND=y
> CONFIG_SND_JACK=y
> CONFIG_SND_SOC=m
> CONFIG_SND_HDA_INTEL=m
> CONFIG_SND_HDA_INPUT_JACK=y

The problem isn't the commit above (it's over a year ago!), but the
recent change of hda input layer.

Will take a look at later.  Thanks.


Takashi

Re: linux-next: Tree for November 20 (snd_jack)

[Takashi Iwai]

At Fri, 20 Nov 2009 20:15:31 +0100,
I wrote:
> 
> At Fri, 20 Nov 2009 10:40:30 -0800,
> Randy Dunlap wrote:
> > 
> > On Fri, 20 Nov 2009 23:05:13 +1100 Stephen Rothwell wrote:
> > 
> > > Hi all,
> > > 
> > > Changes since 20091119:
> > 
> > 
> > This commit in linux-next-20091120:
> > 
> > author	Mark Brown <broonie@opensource.wolfsonmicro.com>	
> > 	Mon, 28 Jul 2008 18:05:36 +0000 (19:05 +0100)
> > committer	Jaroslav Kysela <perex@perex.cz>	
> > 	Tue, 29 Jul 2008 19:32:06 +0000 (21:32 +0200)
> > commit	0d94e41abe271c86df06bcf72d24f9ca7ce771f0
> > 
> > causes build errors when:
> > 
> > CONFIG_INPUT=m
> > CONFIG_SND=y
> > CONFIG_SND_JACK=y
> > CONFIG_SND_SOC=m
> > CONFIG_SND_HDA_INTEL=m
> > CONFIG_SND_HDA_INPUT_JACK=y
> 
> The problem isn't the commit above (it's over a year ago!), but the
> recent change of hda input layer.
> 
> Will take a look at later.  Thanks.

Does the patch below work?


thanks,

Takashi

---
diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
index 25ae10e..556cff9 100644
--- a/sound/pci/hda/Kconfig
+++ b/sound/pci/hda/Kconfig
@@ -51,7 +51,7 @@ config SND_HDA_INPUT_BEEP_MODE
 
 config SND_HDA_INPUT_JACK
 	bool "Support jack plugging notification via input layer"
-	depends on INPUT=y || INPUT=SND_HDA_INTEL
+	depends on INPUT=y || INPUT=SND
 	select SND_JACK
 	help
 	  Say Y here to enable the jack plugging notification via

Re: linux-next: Tree for November 20 (snd_jack)

[Randy Dunlap]

On Fri, 20 Nov 2009 20:21:03 +0100 Takashi Iwai wrote:

> At Fri, 20 Nov 2009 20:15:31 +0100,
> I wrote:
> > 
> > At Fri, 20 Nov 2009 10:40:30 -0800,
> > Randy Dunlap wrote:
> > > 
> > > On Fri, 20 Nov 2009 23:05:13 +1100 Stephen Rothwell wrote:
> > > 
> > > > Hi all,
> > > > 
> > > > Changes since 20091119:
> > > 
> > > 
> > > This commit in linux-next-20091120:
> > > 
> > > author	Mark Brown <broonie@opensource.wolfsonmicro.com>	
> > > 	Mon, 28 Jul 2008 18:05:36 +0000 (19:05 +0100)
> > > committer	Jaroslav Kysela <perex@perex.cz>	
> > > 	Tue, 29 Jul 2008 19:32:06 +0000 (21:32 +0200)
> > > commit	0d94e41abe271c86df06bcf72d24f9ca7ce771f0
> > > 
> > > causes build errors when:
> > > 
> > > CONFIG_INPUT=m
> > > CONFIG_SND=y
> > > CONFIG_SND_JACK=y
> > > CONFIG_SND_SOC=m
> > > CONFIG_SND_HDA_INTEL=m
> > > CONFIG_SND_HDA_INPUT_JACK=y
> > 
> > The problem isn't the commit above (it's over a year ago!), but the
> > recent change of hda input layer.

Ack, sorry about that.

> > Will take a look at later.  Thanks.
> 
> Does the patch below work?
> 

Yes, it does, thanks.

> 
> thanks,
> 
> Takashi
> 
> ---
> diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
> index 25ae10e..556cff9 100644
> --- a/sound/pci/hda/Kconfig
> +++ b/sound/pci/hda/Kconfig
> @@ -51,7 +51,7 @@ config SND_HDA_INPUT_BEEP_MODE
>  
>  config SND_HDA_INPUT_JACK
>  	bool "Support jack plugging notification via input layer"
> -	depends on INPUT=y || INPUT=SND_HDA_INTEL
> +	depends on INPUT=y || INPUT=SND
>  	select SND_JACK
>  	help
>  	  Say Y here to enable the jack plugging notification via


---
~Randy

Re: linux-next: Tree for November 20 (snd_jack)

[Takashi Iwai]

At Fri, 20 Nov 2009 11:34:41 -0800,
Randy Dunlap wrote:
> 
> On Fri, 20 Nov 2009 20:21:03 +0100 Takashi Iwai wrote:
> 
> > At Fri, 20 Nov 2009 20:15:31 +0100,
> > I wrote:
> > > 
> > > At Fri, 20 Nov 2009 10:40:30 -0800,
> > > Randy Dunlap wrote:
> > > > 
> > > > On Fri, 20 Nov 2009 23:05:13 +1100 Stephen Rothwell wrote:
> > > > 
> > > > > Hi all,
> > > > > 
> > > > > Changes since 20091119:
> > > > 
> > > > 
> > > > This commit in linux-next-20091120:
> > > > 
> > > > author	Mark Brown <broonie@opensource.wolfsonmicro.com>	
> > > > 	Mon, 28 Jul 2008 18:05:36 +0000 (19:05 +0100)
> > > > committer	Jaroslav Kysela <perex@perex.cz>	
> > > > 	Tue, 29 Jul 2008 19:32:06 +0000 (21:32 +0200)
> > > > commit	0d94e41abe271c86df06bcf72d24f9ca7ce771f0
> > > > 
> > > > causes build errors when:
> > > > 
> > > > CONFIG_INPUT=m
> > > > CONFIG_SND=y
> > > > CONFIG_SND_JACK=y
> > > > CONFIG_SND_SOC=m
> > > > CONFIG_SND_HDA_INTEL=m
> > > > CONFIG_SND_HDA_INPUT_JACK=y
> > > 
> > > The problem isn't the commit above (it's over a year ago!), but the
> > > recent change of hda input layer.
> 
> Ack, sorry about that.
> 
> > > Will take a look at later.  Thanks.
> > 
> > Does the patch below work?
> > 
> 
> Yes, it does, thanks.

Thanks for confirmation!  I applied the fix now.


Takashi

> 
> > 
> > thanks,
> > 
> > Takashi
> > 
> > ---
> > diff --git a/sound/pci/hda/Kconfig b/sound/pci/hda/Kconfig
> > index 25ae10e..556cff9 100644
> > --- a/sound/pci/hda/Kconfig
> > +++ b/sound/pci/hda/Kconfig
> > @@ -51,7 +51,7 @@ config SND_HDA_INPUT_BEEP_MODE
> >  
> >  config SND_HDA_INPUT_JACK
> >  	bool "Support jack plugging notification via input layer"
> > -	depends on INPUT=y || INPUT=SND_HDA_INTEL
> > +	depends on INPUT=y || INPUT=SND
> >  	select SND_JACK
> >  	help
> >  	  Say Y here to enable the jack plugging notification via
> 
> 
> ---
> ~Randy
> 

linux-next: Tree for November 20

[Stephen Rothwell]

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

Hi all,

Changes since 20081119:

Undropped trees:
	driver-core
	usb
	staging

Dropped trees (temporarily):
	rr (build problem)
	proc (build problem)
	userns (it depends on creds)
	semaphore-removal (due to unfixed conflicts against Linus' tree)

The s390 tree gained a conflict against the powerpc tree.

The sched tree lost its conflict.

The net tree lost its 2 conflicts but gained another conflict against the
wireless-current tree and required two fixes to the merge.

The wireless tree gained a conflict against the wireless-current tree.

The rr tree gained a conflict against the s390 tree and also a build
failure that caused me to drop the tree.

The block tree lost its conflict.

The security-testing tree gained a conflict against the ocfs2 tree.

The proc tree gained 2 conflicts against the security-testing tree and a
build failure that caused me to drop the 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 (if any), 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 126 trees (counting Linus' and 15 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 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-2.6.26
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 mips/mips-for-linux-next
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging pxa/for-next
Merging s390/features
CONFLICT (content): Merge conflict in drivers/char/Kconfig
CONFLICT (content): Merge conflict in drivers/char/Makefile
CONFLICT (content): Merge conflict in include/linux/kernel.h
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
Merging xtensa/master
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
Merging stackprotector/auto-stackprotector-next
Merging timers/auto-timers-next
Merging pci/linux-next
Merging quilt/device-mapper
Merging hid/mm
Merging quilt/i2c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/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 nfsd/nfsd-next
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging ocfs2/linux-next
Merging ext4/next
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in include/net/mac80211.h
Applying net: async_tx merge fix
Applying net: ieee80211_notify_mac merge fix
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
Merging cpufreq/next
Merging v9fs/for-next
Merging quilt/rr
CONFLICT (content): Merge conflict in arch/s390/include/asm/smp.h
CONFLICT (content): Merge conflict in arch/s390/kernel/smp.c
$ git reset --hard HEAD^
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging semaphore/semaphore
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
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 kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in arch/x86/mm/Makefile
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging generic-ipi/auto-generic-ipi-next
Merging mfd/for-next
Merging hdlc/hdlc-next
CONFLICT (delete/modify): drivers/net/wan/syncppp.c deleted in hdlc/hdlc-next and modified in HEAD. Version HEAD of drivers/net/wan/syncppp.c left in tree.
$ git rm -f drivers/net/wan/syncppp.c
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
CONFLICT (content): Merge conflict in fs/ocfs2/namei.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_cred.h
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_globals.h
CONFLICT (content): Merge conflict in fs/xfs/xfs_vnodeops.h
Merging lblnet/master
Merging quilt/ttydev
CONFLICT (content): Merge conflict in fs/devpts/inode.c
Merging agp/agp-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in fs/proc/base.c
CONFLICT (content): Merge conflict in kernel/exit.c
$ git reset --hard HEAD^
Merging bdev/master
Merging dwmw2-iommu/master
Merging cpu_alloc/cpu_alloc
CONFLICT (content): Merge conflict in kernel/lockdep.c
CONFLICT (content): Merge conflict in kernel/module.c
Applying cpu_alloc: merge_fix_1
Applying undefined reference to __per_cpu_start
Merging cputime/cputime
Merging perfmon3/master
Merging osd/linux-next
Merging fatfs/master
Merging quilt/staging
Merging scsi-post-merge/master

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