linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* linux-next: Tree for March 4
@ 2008-03-04 11:39 Stephen Rothwell
  2008-03-04 17:54 ` Dan Williams
  2008-03-04 21:01 ` Stefan Richter
  0 siblings, 2 replies; 15+ messages in thread
From: Stephen Rothwell @ 2008-03-04 11:39 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

I have created today's linux-next tree at
git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.

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
allmodconfig for both powerpc and x86_64.

There were three minor merge problems.

We are up to 40 trees, more are welcome (even if they are currently
empty).  The influx of new trees has been underwhelming.  Thanks to those
who have contributed, and to those who haven't, please do.

Status of my local build tests is at
http://kisskb.ellerman.id.au/kisskb/branch/9/.  If maintainers want to
give advice about cross compilers/configs that work, we are always open
to add more builds.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2008-03-04 11:39 linux-next: Tree for March 4 Stephen Rothwell
@ 2008-03-04 17:54 ` Dan Williams
  2008-03-04 23:25   ` Stephen Rothwell
  2008-03-04 21:01 ` Stefan Richter
  1 sibling, 1 reply; 15+ messages in thread
From: Dan Williams @ 2008-03-04 17:54 UTC (permalink / raw)
  To: Stephen Rothwell, Andrew Morton; +Cc: linux-next, LKML

On Tue, Mar 4, 2008 at 4:39 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>  We are up to 40 trees, more are welcome (even if they are currently
>  empty).  The influx of new trees has been underwhelming.  Thanks to those
>  who have contributed, and to those who haven't, please do.
>

Hello Stephen, Andrew,

I have recently moved the async_tx git tree to kernel.org.

For linux-next please add:

    master.kernel.org:/pub/scm/linux/kernel/git/djbw/async_tx.git next

For -mm please replace the 'git-md-accel' url with the following, it
should also be renamed to 'git-async-tx' as anything that impacts MD
will go through Neil.

    master.kernel.org:/pub/scm/linux/kernel/git/djbw/async_tx.git upstream

Currently both trees contain the following:
Dan Williams (7):
      fsldma: do not cleanup descriptors in hardirq context
      dmaengine: fix sparse warning
      ioat: fix 'ack' handling, driver must ensure that 'ack' is zero
      async_tx: checkpatch says s/__FUNCTION__/__func__/g
      async_tx: fix multiple dependency submission
      async_tx: kill ->device_dependency_added
      iop-adma: remove the workaround for missed interrupts on iop3xx

Zhang Wei (1):
      dmaengine: add driver for Freescale MPC85xx DMA controller

Regards,
Dan

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2008-03-04 11:39 linux-next: Tree for March 4 Stephen Rothwell
  2008-03-04 17:54 ` Dan Williams
@ 2008-03-04 21:01 ` Stefan Richter
  2008-03-05  7:41   ` Sam Ravnborg
  2008-03-05  7:57   ` Stephen Rothwell
  1 sibling, 2 replies; 15+ messages in thread
From: Stefan Richter @ 2008-03-04 21:01 UTC (permalink / raw)
  To: Stephen Rothwell, Sam Ravnborg; +Cc: linux-next, LKML

Stephen Rothwell wrote:
> git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> There were three minor merge problems.

One of them is tests.git's lib/Kconfig.debug.  linux1394-2.6.git's 
commit 523a65f1a7a339e528ca6d6d808516fe195fde03 apparently is the one 
causing it.

Stephen, should one of me and Sam adjust his -next branch?  (This kind 
of conflict will be trivially avoided in the merge window; so resolving 
it now would mainly mean one manual(?) step less for Stephen.)
-- 
Stefan Richter
-=====-==--- --== --=--
http://arcgraph.de/sr/

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2008-03-04 17:54 ` Dan Williams
@ 2008-03-04 23:25   ` Stephen Rothwell
  0 siblings, 0 replies; 15+ messages in thread
From: Stephen Rothwell @ 2008-03-04 23:25 UTC (permalink / raw)
  To: Dan Williams; +Cc: Andrew Morton, linux-next, LKML

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

Hi Dan,

On Tue, 4 Mar 2008 10:54:41 -0700 "Dan Williams" <dan.j.williams@intel.com> wrote:
>
> For linux-next please add:
> 
>     master.kernel.org:/pub/scm/linux/kernel/git/djbw/async_tx.git next

Added, thanks (though I used git.kernel.org).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2008-03-04 21:01 ` Stefan Richter
@ 2008-03-05  7:41   ` Sam Ravnborg
  2008-03-05  7:57   ` Stephen Rothwell
  1 sibling, 0 replies; 15+ messages in thread
From: Sam Ravnborg @ 2008-03-05  7:41 UTC (permalink / raw)
  To: Stefan Richter; +Cc: Stephen Rothwell, linux-next, LKML

On Tue, Mar 04, 2008 at 10:01:47PM +0100, Stefan Richter wrote:
> Stephen Rothwell wrote:
> >git://git.kernel.org/pub/scm/linux/kernel/git/sfr/linux-next.git.
> >There were three minor merge problems.
> 
> One of them is tests.git's lib/Kconfig.debug.  linux1394-2.6.git's 
> commit 523a65f1a7a339e528ca6d6d808516fe195fde03 apparently is the one 
> causing it.

I think I have a patch for this somewhere.
But I do not have time to look into this until earliest in the weekend.
And the test.git tree is down on my TODO list as I have pending issues in kbuild.git.

	Sam

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2008-03-04 21:01 ` Stefan Richter
  2008-03-05  7:41   ` Sam Ravnborg
@ 2008-03-05  7:57   ` Stephen Rothwell
  1 sibling, 0 replies; 15+ messages in thread
From: Stephen Rothwell @ 2008-03-05  7:57 UTC (permalink / raw)
  To: Stefan Richter; +Cc: Sam Ravnborg, linux-next, LKML

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

Hi Stefan, Sam,

On Tue, 04 Mar 2008 22:01:47 +0100 Stefan Richter <stefanr@s5r6.in-berlin.de> wrote:
>
> One of them is tests.git's lib/Kconfig.debug.  linux1394-2.6.git's 
> commit 523a65f1a7a339e528ca6d6d808516fe195fde03 apparently is the one 
> causing it.
> 
> Stephen, should one of me and Sam adjust his -next branch?  (This kind 
> of conflict will be trivially avoided in the merge window; so resolving 
> it now would mainly mean one manual(?) step less for Stephen.)

I can live with it for a while.

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2011-03-06 22:52 ` Mariusz Kozlowski
@ 2011-03-07 11:46   ` Mark Brown
  0 siblings, 0 replies; 15+ messages in thread
From: Mark Brown @ 2011-03-07 11:46 UTC (permalink / raw)
  To: Mariusz Kozlowski; +Cc: Stephen Rothwell, linux-next, LKML, Liam Girdwood

On Sun, Mar 06, 2011 at 11:52:10PM +0100, Mariusz Kozlowski wrote:

> Looking at surrounding code it's missing ifdef for CONFIG_DEBUG_FS.

Yup, should be fixed now.

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2011-03-04  7:00 Stephen Rothwell
@ 2011-03-06 22:52 ` Mariusz Kozlowski
  2011-03-07 11:46   ` Mark Brown
  0 siblings, 1 reply; 15+ messages in thread
From: Mariusz Kozlowski @ 2011-03-06 22:52 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML, Mark Brown, Liam Girdwood

Hi,

sound/soc/soc-core.c: In function 'snd_soc_instantiate_card':
sound/soc/soc-core.c:1882: error: 'struct snd_soc_dapm_context' has no member named 'debugfs_dapm'
sound/soc/soc-core.c:1883: error: 'struct snd_soc_card' has no member named 'debugfs_card_root'
sound/soc/soc-core.c:1884: error: 'struct snd_soc_dapm_context' has no member named 'debugfs_dapm'

Looking at surrounding code it's missing ifdef for CONFIG_DEBUG_FS.

-- 
Mariusz Kozlowski

^ permalink raw reply	[flat|nested] 15+ messages in thread
* linux-next: Tree for March 4
@ 2011-03-04  7:00 Stephen Rothwell
  2011-03-06 22:52 ` Mariusz Kozlowski
  0 siblings, 1 reply; 15+ messages in thread
From: Stephen Rothwell @ 2011-03-04  7:00 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20110303:

Dropped tree: xen

The i.MX tree gained a conflict against the arm tree.

The s5p tree gained a conflict against the i.MX tree.

The v4l-dvb tree lost its build failure.

The net tree gained a conflict against the i.MX tree.

The usb tree gained a conflict against the i.MX tree.

The staging tree gained conflicts against the v4l-dvb tree.

The powerpc allyesconfig build is still broken by some obscure bloating
of the low memory code.

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

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 28 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 kbuild-current/rc-fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging 52xx-and-virtex-current/powerpc/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 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 devicetree-current/devicetree/merge
Merging spi-current/spi/merge
Merging arm/for-next
Merging davinci/davinci-next
Merging i.MX/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-mxs/gpio.c
Merging linux-spec/for-next
Merging msm/for-next
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x27.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-msm7x30.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-qsd8x50.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/board-sapphire.c
CONFLICT (content): Merge conflict in arch/arm/mach-msm/include/mach/memory.h
Merging omap/for-next
Merging pxa/for-next
Merging samsung/next-samsung
Merging s5p/for-next
CONFLICT (content): Merge conflict in arch/arm/mm/Kconfig
Merging tegra/for-next
Merging ux500-core/ux500-core
CONFLICT (content): Merge conflict in arch/arm/configs/u8500_defconfig
CONFLICT (content): Merge conflict in arch/arm/mach-ux500/cpu-db8500.c
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/powerpc/next
Merging galak/next
Merging s390/features
Merging sh/sh-latest
Merging rmobile/rmobile-latest
Merging sparc/master
Merging tile/master
Merging unicore32/unicore32
CONFLICT (content): Merge conflict in drivers/video/Kconfig
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
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
CONFLICT (content): Merge conflict in drivers/hwmon/Makefile
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 arch/alpha/Kconfig
CONFLICT (content): Merge conflict in arch/parisc/Kconfig
CONFLICT (content): Merge conflict in arch/sparc/Kconfig
Merging idle-test/idle-test
Merging powertools/tools-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
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_ata.c
CONFLICT (content): Merge conflict in drivers/scsi/libsas/sas_scsi_host.c
Merging async_tx/next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/Kconfig
CONFLICT (content): Merge conflict in drivers/net/bnx2x/bnx2x.h
CONFLICT (content): Merge conflict in lib/Makefile
Merging wireless/master
Merging bluetooth/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging sound-asoc/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
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-mx27_3ds.c
CONFLICT (content): Merge conflict in arch/arm/mach-imx/mach-pcm038.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31_3ds.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx3/mach-mx31moboard.c
CONFLICT (content): Merge conflict in drivers/mfd/davinci_voicecodec.c
CONFLICT (content): Merge conflict in drivers/mfd/ucb1x00-ts.c
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
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 fs/eventpoll.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/devicetree/next
Merging spi/spi/next
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/kernel/acpi/sleep.c
Merging rcu/rcu/next
Merging oprofile/for-next
Merging xen-two/linux-next
Merging xen-pvhvm/linux-next
Merging edac-amd/for-next
CONFLICT (content): Merge conflict in include/linux/pci_ids.h
Merging percpu/for-next
CONFLICT (content): Merge conflict in arch/x86/kernel/vmlinux.lds.S
Merging workqueues/for-next
Merging sfi/sfi-test
Merging asm-generic/next
Merging drivers-x86/linux-next
CONFLICT (content): Merge conflict in drivers/hwmon/lm85.c
Applying: OLPC: fix for removal of run_wake_count
Merging hwpoison/hwpoison
Merging sysctl/master
Merging driver-core/driver-core-next
Merging tty/tty-next
CONFLICT (content): Merge conflict in drivers/tty/serial/Kconfig
CONFLICT (content): Merge conflict in drivers/tty/serial/Makefile
Merging usb/usb-next
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-4430sdp.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/board-omap3evm.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/clock3xxx_data.c
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/usb-musb.c
CONFLICT (content): Merge conflict in arch/arm/plat-omap/include/plat/usb.h
CONFLICT (content): Merge conflict in drivers/usb/gadget/Kconfig
CONFLICT (content): Merge conflict in drivers/usb/gadget/fsl_mxc_udc.c
CONFLICT (content): Merge conflict in drivers/usb/musb/musb_core.h
Merging staging/staging-next
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (content): Merge conflict in drivers/staging/brcm80211/brcmsmac/wl_mac80211.c
CONFLICT (delete/modify): drivers/staging/dabusb/dabusb.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/dabusb/dabusb.c left in tree.
CONFLICT (delete/modify): drivers/staging/dabusb/dabusb.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/dabusb/dabusb.h left in tree.
CONFLICT (content): Merge conflict in drivers/staging/easycap/easycap_ioctl.c
CONFLICT (delete/modify): drivers/staging/usbvideo/usbvideo.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/usbvideo/usbvideo.c left in tree.
CONFLICT (delete/modify): drivers/staging/usbvideo/vicam.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/usbvideo/vicam.c left in tree.
$ git rm -f drivers/staging/usbvideo/usbvideo.c
$ git rm -f drivers/staging/usbvideo/vicam.c
$ git rm -f drivers/staging/dabusb/dabusb.c drivers/staging/dabusb/dabusb.h
Merging slabh/slabh
Merging bkl-config/config
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 --]

^ permalink raw reply	[flat|nested] 15+ messages in thread
* linux-next: Tree for March 4
@ 2010-03-04  6:26 Stephen Rothwell
  0 siblings, 0 replies; 15+ messages in thread
From: Stephen Rothwell @ 2010-03-04  6:26 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20100303:

My fixes tree contains:
	a patch for a pktcdvd build error from Arnd Bergmann
	
We are seeing conflicts migrate from being between 2 trees in linux-next
to be between a tree and Linus' tree as things start to get merged.

The arm tree gained 2 conflicts against Linus' tree.

The i.MX tree lost its conflict.

The samsung tree lost its conflicts.

The genesis tree lost its conflict.

The mtd tree still has its 2 build failures for which I applied patches.

The fsnotify tree gained several conflicts against the vfs tree.

The driver-core tree (interacting with the wireless tree) still has a
build failure for which I applied a patch.

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

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 159 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 arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-mx2/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx2/devices.h
CONFLICT (content): Merge conflict in arch/arm/mach-mx25/clock.c
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa-ssp.c
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 cris/for-next
Merging ia64/test
Merging m68k/for-next
Merging m68knommu/for-next
Merging microblaze/next
CONFLICT (content): Merge conflict in arch/microblaze/include/asm/prom.h
Merging mips/mips-for-linux-next
CONFLICT (content): Merge conflict in arch/mips/alchemy/common/platform.c
CONFLICT (content): Merge conflict in arch/mips/alchemy/common/setup.c
CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1200/platform.c
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/db1x00/board_setup.c
CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/db1x00/platform.c
CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1100/platform.c
CONFLICT (content): Merge conflict in arch/mips/alchemy/devboards/pb1200/platform.c
CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1500/platform.c
CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/pb1550/platform.c
CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.c
CONFLICT (add/add): Merge conflict in arch/mips/alchemy/devboards/platform.h
CONFLICT (add/add): Merge conflict in arch/mips/alchemy/xxs1500/platform.c
CONFLICT (content): Merge conflict in arch/mips/cavium-octeon/octeon-irq.c
CONFLICT (content): Merge conflict in arch/mips/configs/db1200_defconfig
CONFLICT (content): Merge conflict in arch/mips/include/asm/mach-au1x00/au1000.h
CONFLICT (content): Merge conflict in drivers/pcmcia/au1000_generic.h
CONFLICT (add/add): Merge conflict in drivers/pcmcia/db1xxx_ss.c
CONFLICT (add/add): Merge conflict in drivers/pcmcia/xxs1500_ss.c
Merging parisc/next
Merging powerpc/next
Merging 4xx/next
Merging 52xx-and-virtex/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging genesis/master
Merging sparc/master
Merging xtensa/master
Merging ceph/for-next
CONFLICT (content): Merge conflict in fs/gfs2/super.c
CONFLICT (content): Merge conflict in fs/xfs/linux-2.6/xfs_super.c
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
CONFLICT (content): Merge conflict in fs/gfs2/super.c
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
Applying: nfsd: fixup for _xfs_log_force API change
Merging reiserfs-bkl/reiserfs/kill-bkl
Merging vfs/for-next
CONFLICT (content): Merge conflict in drivers/infiniband/core/uverbs_main.c
CONFLICT (content): Merge conflict in security/tomoyo/realpath.c
Applying: logfs: fixup for write_inode API change
Merging pci/linux-next
Merging hid/for-next
Merging quilt/i2c
Merging bjdooks-i2c/next-i2c
CONFLICT (content): Merge conflict in drivers/i2c/busses/Kconfig
CONFLICT (content): Merge conflict in drivers/i2c/busses/Makefile
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
Merging v4l-dvb/master
CONFLICT (add/add): Merge conflict in drivers/media/video/tvp7002.c
Merging kbuild/for-next
Merging kconfig/for-next
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/linux-next
CONFLICT (content): Merge conflict in Documentation/feature-removal-schedule.txt
Merging dlm/next
Merging ibft/master
Merging scsi/master
Merging async_tx/next
Merging net/master
Merging wireless/master
Merging mtd/master
CONFLICT (content): Merge conflict in drivers/mtd/nand/sh_flctl.c
Applying: mtd: nand: fix name space clash
Applying: mtd: declare inline functions static
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
CONFLICT (content): Merge conflict in drivers/acpi/processor_core.c
Applying: cpufreq: merge fixup for processor_core.c rename
Merging quilt/rr
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in drivers/char/hvc_console.c
CONFLICT (content): Merge conflict in drivers/char/hvc_console.h
Merging mmc/next
Merging tmio-mmc/linux-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 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
Applying: slab: update for percpu API change
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-isch.c
Merging hdlc/hdlc-next
Merging drm/drm-next
CONFLICT (content): Merge conflict in drivers/gpu/vga/Kconfig
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
CONFLICT (content): Merge conflict in arch/arm/mach-u300/include/mach/debug-macro.S
CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_ethtool.c
CONFLICT (content): Merge conflict in drivers/net/qlge/qlge_main.c
CONFLICT (content): Merge conflict in drivers/net/typhoon.c
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_user.c
CONFLICT (content): Merge conflict in include/linux/fsnotify.h
CONFLICT (content): Merge conflict in kernel/audit_tree.c
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 als/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 hwpoison/hwpoison
Merging sysctl/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/base/power/main.c
CONFLICT (content): Merge conflict in drivers/pcmcia/ds.c
CONFLICT (content): Merge conflict in include/linux/device.h
Applying: i2c: update for semaphore to mutex conversion of devices
Applying: sysfs: fix for thinko with sysfs_bin_attr_init()
Applying: ar9170: fix for driver-core ABI change
Merging quilt/tty
Merging quilt/usb
CONFLICT (content): Merge conflict in arch/arm/mach-mx2/devices.c
CONFLICT (content): Merge conflict in arch/arm/mach-mx2/devices.h
CONFLICT (content): Merge conflict in drivers/usb/core/driver.c
CONFLICT (content): Merge conflict in drivers/usb/early/ehci-dbgp.c
CONFLICT (content): Merge conflict in drivers/usb/storage/scsiglue.c
Merging quilt/staging
CONFLICT (content): Merge conflict in drivers/staging/rtl8192su/ieee80211/ieee80211_rx.c
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

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2009-03-05  9:11     ` Stephen Rothwell
@ 2009-03-05 10:27       ` Geert Uytterhoeven
  0 siblings, 0 replies; 15+ messages in thread
From: Geert Uytterhoeven @ 2009-03-05 10:27 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML

Hi Stephen,

On Thu, Mar 5, 2009 at 10:11, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Hi Geert,
>
> On Thu, 5 Mar 2009 09:44:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>
>> On Wed, 4 Mar 2009 22:57:32 +0100 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>> >
>> > It seems http://kisskb.ellerman.id.au/linux-next and
>> > http://kisskb.ellerman.id.au/kisskb/matrix/
>> > are not being updated? The most recent results are dated March 1.
>>
>> Thanks for the heads up, I will check it out.
>
> Should be good now.

Verified, thanks!

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2009-03-04 22:44   ` Stephen Rothwell
@ 2009-03-05  9:11     ` Stephen Rothwell
  2009-03-05 10:27       ` Geert Uytterhoeven
  0 siblings, 1 reply; 15+ messages in thread
From: Stephen Rothwell @ 2009-03-05  9:11 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: linux-next, LKML

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

Hi Geert,

On Thu, 5 Mar 2009 09:44:52 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Wed, 4 Mar 2009 22:57:32 +0100 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
> >
> > It seems http://kisskb.ellerman.id.au/linux-next and
> > http://kisskb.ellerman.id.au/kisskb/matrix/
> > are not being updated? The most recent results are dated March 1.
> 
> Thanks for the heads up, I will check it out.

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

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2009-03-04 21:57 ` Geert Uytterhoeven
@ 2009-03-04 22:44   ` Stephen Rothwell
  2009-03-05  9:11     ` Stephen Rothwell
  0 siblings, 1 reply; 15+ messages in thread
From: Stephen Rothwell @ 2009-03-04 22:44 UTC (permalink / raw)
  To: Geert Uytterhoeven; +Cc: linux-next, LKML

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

Hi Geert,

On Wed, 4 Mar 2009 22:57:32 +0100 Geert Uytterhoeven <geert@linux-m68k.org> wrote:
>
> It seems http://kisskb.ellerman.id.au/linux-next and
> http://kisskb.ellerman.id.au/kisskb/matrix/
> are not being updated? The most recent results are dated March 1.

Thanks for the heads up, I will check it out.

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

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
* Re: linux-next: Tree for March 4
  2009-03-04  7:06 Stephen Rothwell
@ 2009-03-04 21:57 ` Geert Uytterhoeven
  2009-03-04 22:44   ` Stephen Rothwell
  0 siblings, 1 reply; 15+ messages in thread
From: Geert Uytterhoeven @ 2009-03-04 21:57 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML

Hi Stephen,

On Wed, Mar 4, 2009 at 08:06, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Status of my local build tests will be at
> http://kisskb.ellerman.id.au/linux-next .  If maintainers want to give

It seems http://kisskb.ellerman.id.au/linux-next and
http://kisskb.ellerman.id.au/kisskb/matrix/
are not being updated? The most recent results are dated March 1.

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 15+ messages in thread
* linux-next: Tree for March 4
@ 2009-03-04  7:06 Stephen Rothwell
  2009-03-04 21:57 ` Geert Uytterhoeven
  0 siblings, 1 reply; 15+ messages in thread
From: Stephen Rothwell @ 2009-03-04  7:06 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20090303:

The net tree gained a conflict against the wireless-current 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 (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 133 trees (counting Linus' and 18 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-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
CONFLICT (content): Merge conflict in arch/arm/mach-at91/gpio.c
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
CONFLICT (rename/modify): Merge conflict in arch/arm/plat-pxa/dma.c
Merging s390/features
Merging sh/master
Merging sparc/master
Merging x86/auto-x86-next
CONFLICT (content): Merge conflict in arch/powerpc/include/asm/elf.h
CONFLICT (delete/modify): arch/x86/mach-default/setup.c deleted in x86/auto-x86-next and modified in HEAD. Version HEAD of arch/x86/mach-default/setup.c left in tree.
$ git rm -f arch/x86/mach-default/setup.c
Merging xtensa/master
Merging quilt/driver-core
CONFLICT (content): Merge conflict in drivers/sh/maple/maple.c
Merging quilt/usb
Merging tip-core/auto-core-next
Merging cpus4096/auto-cpus4096-next
Merging tracing/auto-tracing-next
CONFLICT (content): Merge conflict in arch/x86/Kconfig
Merging genirq/auto-genirq-next
CONFLICT (content): Merge conflict in kernel/irq/handle.c
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
CONFLICT (content): Merge conflict in drivers/pci/pcie/portdrv_pci.c
Merging quilt/device-mapper
Merging hid/for-next
Merging quilt/i2c
CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-mpc.c
Merging quilt/jdelvare-hwmon
Merging quilt/kernel-doc
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
Merging v4l-dvb/master
CONFLICT (content): Merge conflict in drivers/media/video/v4l2-device.c
Merging quota/for_next
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
Applying: acpi: update thermal for bus_id removal
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
CONFLICT (content): Merge conflict in fs/ocfs2/ocfs2.h
Merging ext4/next
CONFLICT (content): Merge conflict in fs/ext4/inode.c
Merging async_tx/next
Merging udf/for_next
Merging net/master
CONFLICT (content): Merge conflict in drivers/net/wimax/i2400m/usb-notif.c
CONFLICT (content): Merge conflict in drivers/net/wireless/rt2x00/rt73usb.c
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging vfs/for-next
Merging sound/for-next
CONFLICT (content): Merge conflict in sound/soc/pxa/pxa2xx-i2s.c
Merging cpufreq/next
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging quilt/rr
CONFLICT (delete/modify): arch/x86/include/asm/es7000/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/es7000/apic.h left in tree.
CONFLICT (delete/modify): arch/x86/include/asm/numaq/apic.h deleted in HEAD and modified in quilt/rr. Version quilt/rr of arch/x86/include/asm/numaq/apic.h left in tree.
CONFLICT (content): Merge conflict in drivers/hid/hid-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134-core.c
CONFLICT (content): Merge conflict in drivers/media/video/saa7134/saa7134.h
CONFLICT (content): Merge conflict in drivers/net/virtio_net.c
CONFLICT (content): Merge conflict in kernel/module.c
$ git rm -f arch/x86/include/asm/es7000/apic.h
$ git rm -f arch/x86/include/asm/numaq/apic.h
Applying: rr: fixup for cpumask:remove-address-of-CPU_MASK_ALL
Merging cifs/master
Merging mmc/next
Merging gfs2/master
Merging input/next
Merging bkl-removal/bkl-removal
Merging ubifs/linux-next
Merging lsm/for-next
Merging block/for-next
Merging embedded/master
Merging firmware/master
CONFLICT (content): Merge conflict in firmware/Makefile
CONFLICT (content): Merge conflict in firmware/WHENCE
CONFLICT (content): Merge conflict in sound/isa/Kconfig
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
CONFLICT (content): Merge conflict in include/linux/slub_def.h
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
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/drm_proc.c
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging kmemcheck/auto-kmemcheck-next
CONFLICT (content): Merge conflict in MAINTAINERS
CONFLICT (content): Merge conflict in mm/Makefile
Merging generic-ipi/auto-generic-ipi-next
Merging oprofile/auto-oprofile-next
Merging fastboot/auto-fastboot-next
Merging sparseirq/auto-sparseirq-next
Merging iommu/auto-iommu-next
CONFLICT (content): Merge conflict in arch/x86/include/asm/dma-mapping.h
Merging uwb/for-upstream
Merging watchdog/master
Merging proc/proc
CONFLICT (content): Merge conflict in security/selinux/hooks.c
Merging bdev/master
Merging dwmw2-iommu/master
Merging cputime/cputime
Merging osd/linux-next
Merging fatfs/master
Merging fuse/for-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging squashfs/master
Merging omap/for-next
Merging quilt/aoe
Merging kmemleak/kmemleak
CONFLICT (content): Merge conflict in Documentation/kernel-parameters.txt
CONFLICT (content): Merge conflict in include/linux/slab.h
CONFLICT (content): Merge conflict in init/main.c
CONFLICT (content): Merge conflict in lib/Kconfig.debug
CONFLICT (content): Merge conflict in mm/slab.c
CONFLICT (content): Merge conflict in mm/slob.c
CONFLICT (content): Merge conflict in mm/slub.c
Merging quilt/staging
Merging scsi-post-merge/master

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

^ permalink raw reply	[flat|nested] 15+ messages in thread
end of thread, other threads:[~2011-03-07 11:46 UTC | newest]

Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2008-03-04 11:39 linux-next: Tree for March 4 Stephen Rothwell
2008-03-04 17:54 ` Dan Williams
2008-03-04 23:25   ` Stephen Rothwell
2008-03-04 21:01 ` Stefan Richter
2008-03-05  7:41   ` Sam Ravnborg
2008-03-05  7:57   ` Stephen Rothwell
2009-03-04  7:06 Stephen Rothwell
2009-03-04 21:57 ` Geert Uytterhoeven
2009-03-04 22:44   ` Stephen Rothwell
2009-03-05  9:11     ` Stephen Rothwell
2009-03-05 10:27       ` Geert Uytterhoeven
2010-03-04  6:26 Stephen Rothwell
2011-03-04  7:00 Stephen Rothwell
2011-03-06 22:52 ` Mariusz Kozlowski
2011-03-07 11:46   ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).