linux-next: Tree for January 18

linux-next: Tree for January 18

[Stephen Rothwell]

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

Hi all,

Reminder: do not add any v2.6.39 material to your linux-next included
trees until after v2.6.38-rc1 is released.

Changes since 20110115:

Dropped tree: xen

The mtd 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 184 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                    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/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
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
CONFLICT (content): Merge conflict in arch/arm/mach-tegra/timer.c
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/for-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
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
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 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
CONFLICT (rename/rename): Rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"arch/arm/mach-s5pv310/include/mach/dma.h" in branch "HEAD" rename "arch/arm/mach-pxa/include/mach/pxa2xx_spi.h"->"include/linux/spi/pxa2xx_spi.h" in "bjdooks-i2c/next-i2c"
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/poodle.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa27x.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/pxa3xx.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/trizeps4.c
CONFLICT (content): Merge conflict in arch/arm/mach-pxa/z2.c
$ git rm -f arch/arm/mach-pxa/include/mach/pxa2xx_spi.h
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
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound-asoc/for-next
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging input/next
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
Merging voltage/for-next
CONFLICT (content): Merge conflict in include/linux/mfd/ab8500.h
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
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 swiotlb-xen/master
CONFLICT (content): Merge conflict in drivers/xen/Kconfig
Merging xen-pvhvm/linux-next
Merging edac-amd/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
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
Merging usb/usb-next
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 (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

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

Re: linux-next: Tree for January 18 (__modver_version_show)

[Randy Dunlap]

On Tue, 18 Jan 2011 12:21:39 +1100 Stephen Rothwell wrote:

> Hi all,
> 
> Reminder: do not add any v2.6.39 material to your linux-next included
> trees until after v2.6.38-rc1 is released.
> 
> Changes since 20110115:


I'm seeing this on several builds (i386 and x86_64):

lib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show'
lib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show'

It looks like the compiler or linker is dropping that function from the
build since it cannot see any references to it...
At least __modver_version_show is not in the kernel/params.o file.

---
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: linux-next: Tree for January 18 (__modver_version_show)

[Stephen Rothwell]

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

Hi Randy,

On Tue, 18 Jan 2011 09:17:49 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>
> I'm seeing this on several builds (i386 and x86_64):
> 
> lib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show'
> lib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show'
> 
> It looks like the compiler or linker is dropping that function from the
> build since it cannot see any references to it...
> At least __modver_version_show is not in the kernel/params.o file.

Do these builds have CONFIG_SYSFS set?

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

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

Re: linux-next: Tree for January 18 (__modver_version_show)

[Randy Dunlap]

On 01/18/11 21:09, Stephen Rothwell wrote:
> Hi Randy,
> 
> On Tue, 18 Jan 2011 09:17:49 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>>
>> I'm seeing this on several builds (i386 and x86_64):
>>
>> lib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show'
>> lib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show'
>>
>> It looks like the compiler or linker is dropping that function from the
>> build since it cannot see any references to it...
>> At least __modver_version_show is not in the kernel/params.o file.
> 
> Do these builds have CONFIG_SYSFS set?
> 

Yes, they all do (50 random builds have CONFIG_SYSFS=y).

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: linux-next: Tree for January 18 (__modver_version_show)

[Randy Dunlap]

On 01/19/11 08:10, Randy Dunlap wrote:
> On 01/18/11 21:09, Stephen Rothwell wrote:
>> Hi Randy,
>>
>> On Tue, 18 Jan 2011 09:17:49 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>>>
>>> I'm seeing this on several builds (i386 and x86_64):
>>>
>>> lib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show'
>>> lib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show'
>>>
>>> It looks like the compiler or linker is dropping that function from the
>>> build since it cannot see any references to it...
>>> At least __modver_version_show is not in the kernel/params.o file.
>>
>> Do these builds have CONFIG_SYSFS set?
>>
> 
> Yes, they all do (50 random builds have CONFIG_SYSFS=y).

Gawd, what bad grepping this morning.

You hit the nail.  They do not have SYSFS enabled.

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: linux-next: Tree for January 18 (__modver_version_show)

[Rusty Russell]

On Thu, 20 Jan 2011 02:42:19 am Randy Dunlap wrote:
> >> On Tue, 18 Jan 2011 09:17:49 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> >>>
> >>> I'm seeing this on several builds (i386 and x86_64):
> >>>
> >>> lib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show'
> >>> lib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show'
...
> You hit the nail.  They do not have SYSFS enabled.

Thanks, does this fix it?

Thanks,
Rusty.

module: fix linker error for MODULE_VERSION when !MODULE and CONFIG_SYSFS=n

lib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show'
lib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show'

Simplest to just not emit anything: if they've disabled SYSFS they probably
want the smallest kernel possible.

Reported-by: Randy Dunlap <randy.dunlap@oracle.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>

diff --git a/include/linux/module.h b/include/linux/module.h
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -168,7 +168,7 @@ extern struct module __this_module;
   local headers in "srcversion".
 */
 
-#ifdef MODULE
+#if defined(MODULE) || !defined(CONFIG_SYSFS)
 #define MODULE_VERSION(_version) MODULE_INFO(version, _version)
 #else
 #define MODULE_VERSION(_version)					\

Re: linux-next: Tree for January 18 (__modver_version_show)

[Dmitry Torokhov]

On Wed, Jan 19, 2011 at 08:12:19AM -0800, Randy Dunlap wrote:
> On 01/19/11 08:10, Randy Dunlap wrote:
> > On 01/18/11 21:09, Stephen Rothwell wrote:
> >> Hi Randy,
> >>
> >> On Tue, 18 Jan 2011 09:17:49 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> >>>
> >>> I'm seeing this on several builds (i386 and x86_64):
> >>>
> >>> lib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show'
> >>> lib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show'
> >>>
> >>> It looks like the compiler or linker is dropping that function from the
> >>> build since it cannot see any references to it...
> >>> At least __modver_version_show is not in the kernel/params.o file.
> >>
> >> Do these builds have CONFIG_SYSFS set?
> >>
> > 
> > Yes, they all do (50 random builds have CONFIG_SYSFS=y).
> 
> Gawd, what bad grepping this morning.
> 
> You hit the nail.  They do not have SYSFS enabled.
> 

Argh, this one is my fault, the following should fix it.

-- 
Dmitry


>From 61b92c66e36e460ddcf4e53a950910fbc637c9c5 Mon Sep 17 00:00:00 2001
From: Dmitry Torokhov <dtor@vmware.com>
Date: Wed, 19 Jan 2011 16:33:06 -0800
Subject: [PATCH] Fix MODULE_VERSION() definition when SYSFS is disabled

Signed-off-by: Dmitry Torokhov <dtor@vmware.com>
---
 include/linux/module.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/module.h b/include/linux/module.h
index 742ebad..e633951 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -168,7 +168,7 @@ extern struct module __this_module;
   local headers in "srcversion".
 */
 
-#ifdef MODULE
+#if defined(MODULE) || !defined(CONFIG_SYSFS)
 #define MODULE_VERSION(_version) MODULE_INFO(version, _version)
 #else
 #define MODULE_VERSION(_version)					\
-- 
1.7.3.2

Re: linux-next: Tree for January 18 (__modver_version_show)

[Randy Dunlap]

On 01/19/11 16:38, Dmitry Torokhov wrote:
> On Wed, Jan 19, 2011 at 08:12:19AM -0800, Randy Dunlap wrote:
>> On 01/19/11 08:10, Randy Dunlap wrote:
>>> On 01/18/11 21:09, Stephen Rothwell wrote:
>>>> Hi Randy,
>>>>
>>>> On Tue, 18 Jan 2011 09:17:49 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
>>>>>
>>>>> I'm seeing this on several builds (i386 and x86_64):
>>>>>
>>>>> lib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show'
>>>>> lib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show'
>>>>>
>>>>> It looks like the compiler or linker is dropping that function from the
>>>>> build since it cannot see any references to it...
>>>>> At least __modver_version_show is not in the kernel/params.o file.
>>>>
>>>> Do these builds have CONFIG_SYSFS set?
>>>>
>>>
>>> Yes, they all do (50 random builds have CONFIG_SYSFS=y).
>>
>> Gawd, what bad grepping this morning.
>>
>> You hit the nail.  They do not have SYSFS enabled.
>>
> 
> Argh, this one is my fault, the following should fix it.
> 

Acked-by: Randy Dunlap <randy.dunlap@oracle.com>

Thanks.

-- 
~Randy
*** Remember to use Documentation/SubmitChecklist when testing your code ***

Re: linux-next: Tree for January 18 (__modver_version_show)

[Dmitry Torokhov]

On Wed, Jan 19, 2011 at 04:59:54PM -0800, Randy Dunlap wrote:
> On 01/19/11 16:38, Dmitry Torokhov wrote:
> > On Wed, Jan 19, 2011 at 08:12:19AM -0800, Randy Dunlap wrote:
> >> On 01/19/11 08:10, Randy Dunlap wrote:
> >>> On 01/18/11 21:09, Stephen Rothwell wrote:
> >>>> Hi Randy,
> >>>>
> >>>> On Tue, 18 Jan 2011 09:17:49 -0800 Randy Dunlap <randy.dunlap@oracle.com> wrote:
> >>>>>
> >>>>> I'm seeing this on several builds (i386 and x86_64):
> >>>>>
> >>>>> lib/built-in.o:(__modver+0x8): undefined reference to `__modver_version_show'
> >>>>> lib/built-in.o:(__modver+0x2c): undefined reference to `__modver_version_show'
> >>>>>
> >>>>> It looks like the compiler or linker is dropping that function from the
> >>>>> build since it cannot see any references to it...
> >>>>> At least __modver_version_show is not in the kernel/params.o file.
> >>>>
> >>>> Do these builds have CONFIG_SYSFS set?
> >>>>
> >>>
> >>> Yes, they all do (50 random builds have CONFIG_SYSFS=y).
> >>
> >> Gawd, what bad grepping this morning.
> >>
> >> You hit the nail.  They do not have SYSFS enabled.
> >>
> > 
> > Argh, this one is my fault, the following should fix it.
> > 
> 
> Acked-by: Randy Dunlap <randy.dunlap@oracle.com>
> 

Great!

Hopefully Rusty will be able to fold it in the original change so it
won't break bisects.

-- 
Dmitry

linux-next: Tree for January 18

[Stephen Rothwell]

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

Hi all,

Changes since 20100114:

Linus' tree still lost its build failure.

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

The nfs tree lost its merge fixup.

The vfs tree gained a conflicts against the gfs2 tree and two build
warnings which required merge fixup patches.

The pci tree gained a build failure for which I applied a patch.

The acpi tree gained a conflict against Linus' tree.

The rr tree gained a conlict against Linus' tree.

The trivial tree gained a build failure (by exposing code that had never
been tested) for which I reverted a commit.

The fsnotify tree gained 2 conflicts against the vfs tree.

The tip tree lost its conflict but gained another against Linus' tree.

The driver-core tree gained a conflict against Linus' tree.

The staging tree gained a conflict against the mips tree.

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

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 156 trees (counting Linus' and 23 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 mtd-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/Makefile
Merging davinci/davinci-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
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
CONFLICT (content): Merge conflict in Documentation/ioctl/ioctl-number.txt
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 logfs/master
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
CONFLICT (add/add): Merge conflict in fs/9p/cache.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
CONFLICT (content): Merge conflict in fs/gfs2/ops_inode.c
Applying: ceph: update for write_inode API change
Applying: logfs: fixup for write_inode API change
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
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
CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/intel_lvds.c
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
CONFLICT (content): Merge conflict in net/mac80211/iface.c
CONFLICT (content): Merge conflict in net/mac80211/scan.c
Merging wireless/master
CONFLICT (content): Merge conflict in drivers/net/wireless/iwlwifi/iwl-core.h
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in include/linux/kernel.h
CONFLICT (content): Merge conflict in include/linux/kmemcheck.h
Merging mmc/next
Merging tmio-mmc/linux-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
CONFLICT (content): Merge conflict in drivers/mfd/asic3.c
CONFLICT (content): Merge conflict in drivers/mfd/t7l66xb.c
CONFLICT (content): Merge conflict in drivers/mfd/tc6387xb.c
CONFLICT (content): Merge conflict in drivers/mfd/tc6393xb.c
CONFLICT (add/add): Merge conflict in drivers/mfd/tmio_core.c
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.c
CONFLICT (content): Merge conflict in drivers/mmc/host/tmio_mmc.h
CONFLICT (content): Merge conflict in include/linux/mfd/tmio.h
Merging hdlc/hdlc-next
Merging drm/drm-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
[master 77d5df3] Revert "CONFIG_DEBUG_FS wrongly written as CONFIG_DEBUGFS"
Merging audit/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging fsnotify/for-next
CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_fsnotify.c
CONFLICT (content): Merge conflict in fs/notify/inotify/inotify_user.c
CONFLICT (content): Merge conflict in include/linux/fs.h
CONFLICT (content): Merge conflict in include/linux/fsnotify.h
Merging irda/for-next
CONFLICT (content): Merge conflict in drivers/net/irda/irda-usb.c
Merging hwlat/for-linus
CONFLICT (content): Merge conflict in MAINTAINERS
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 include/linux/Kbuild
CONFLICT (content): Merge conflict in lib/Kconfig
Merging i7core_edac/linux_next
Merging devicetree/next-devicetree
Merging spi/next-spi
Merging limits/writable_limits
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
Merging omap_dss2/for-next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in scripts/recordmcount.pl
Merging edac-amd/for-next
Merging oprofile/for-next
Merging percpu/for-next
Applying: slab: update for percpu API change
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/memory.c
Merging quilt/tty
Merging quilt/usb
Merging quilt/staging
CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.c deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.c left in tree.
CONFLICT (delete/modify): drivers/staging/sm7xx/smtc2d.h deleted in quilt/staging and modified in HEAD. Version HEAD of drivers/staging/sm7xx/smtc2d.h left in tree.
$ git rm -f drivers/staging/sm7xx/smtc2d.c drivers/staging/sm7xx/smtc2d.h
Merging scsi-post-merge/master
Applying: pci: PCIE_PME seems to depend on ACPI

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