Linux-Next discussions
 help / color / mirror / Atom feed
* Re: Main things left in linux-next
From: Jeff Garzik @ 2009-06-24  7:52 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, LKML, Pekka Enberg, Christoph Lameter, Andrew Morton,
	Linus, Geert Uytterhoeven, Len Brown, Avi Kivity, Jens Axboe,
	Richard Purdie, Boaz Harrosh
In-Reply-To: <20090624174950.dd59e733.sfr@canb.auug.org.au>

Stephen Rothwell wrote:
> Hi Jeff,
> 
> On Wed, 24 Jun 2009 03:43:53 -0400 Jeff Garzik <jeff@garzik.org> wrote:
>> Stephen Rothwell wrote:
>>> The main obvious things left are:
>>>
>>> osdblk from the osd tree
>>
>> I thought Boaz pushed this one the other day...
> 
> I guess Linus just hasn't taken it yet, then.

Yes, the purpose of my message was to implicitly poke relevant people :)

	Jeff

^ permalink raw reply

* Re: Main things left in linux-next
From: Stephen Rothwell @ 2009-06-24  7:49 UTC (permalink / raw)
  To: Jeff Garzik
  Cc: linux-next, LKML, Pekka Enberg, Christoph Lameter, Andrew Morton,
	Linus, Geert Uytterhoeven, Len Brown, Avi Kivity, Jens Axboe,
	Richard Purdie, Boaz Harrosh
In-Reply-To: <4A41D939.40507@garzik.org>

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

Hi Jeff,

On Wed, 24 Jun 2009 03:43:53 -0400 Jeff Garzik <jeff@garzik.org> wrote:
>
> Stephen Rothwell wrote:
> > The main obvious things left are:
> > 
> > osdblk from the osd tree
> 
> 
> I thought Boaz pushed this one the other day...

I guess Linus just hasn't taken it yet, then.

-- 
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

* Re: Main things left in linux-next
From: Jens Axboe @ 2009-06-24  7:48 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, LKML, Pekka Enberg, Christoph Lameter, Andrew Morton,
	Linus, Geert Uytterhoeven, Joel Becker,
	"Frédéric Weisbecker", Len Brown, Avi Kivity,
	Rusty Russell, Alasdair G Kergon, Anton Vorontsov, Richard Purdie,
	Boaz Harrosh, Jon Masters, Greg KH
In-Reply-To: <20090624172735.9b500674.sfr@canb.auug.org.au>

On Wed, Jun 24 2009, Stephen Rothwell wrote:
> Hi All,
> 
> $ git diff --shortstat -M stable..HEAD^
>  587 files changed, 27313 insertions(+), 12317 deletions(-)
> 
> We seem to be going backwards :-( Yesterday's was:
>  556 files changed, 27596 insertions(+), 7123 deletions(-)
> 
> $ git diff --dirstat -M stable..HEAD^
>    4.9% Documentation/powerpc/dts-bindings/
>    5.1% Documentation/powerpc/
>    3.0% Documentation/vm/
>    3.9% arch/sparc/
>    3.9% arch/x86/kvm/
>    4.4% arch/x86/
>    6.9% drivers/md/
>    4.7% drivers/misc/
>    9.8% drivers/staging/et131x/
>    4.3% drivers/staging/
>    6.6% drivers/usb/otg/
>   14.5% drivers/
>    5.5% include/linux/
>   12.6% mm/
> 
> The main obvious things left are:
> 
> SLQB from the slab tree
> an m68k update
> an ocfs2 update
> the reiserfs kill-the-bkl effort
> an acpi update
> a kvm update
> some more cpumask work from the rr tree
> the writeback changes form the block tree
> a device-mapper update
> a battery tree update
> a leds tree update
> osdblk from the osd tree
> the new hwlat tree
> devtmpfs from the driver-core tree (hmmm?)
> 
> Please do not shoot the messenger. :-)

The writeback changes will be sitting there until .32 :-)

-- 
Jens Axboe

^ permalink raw reply

* Re: Main things left in linux-next
From: Stephen Rothwell @ 2009-06-24  7:46 UTC (permalink / raw)
  To: Pekka Enberg
  Cc: linux-next, LKML, Christoph Lameter, Andrew Morton, Linus,
	Nick Piggin
In-Reply-To: <84144f020906240040ycf40bd6q20af82907315adc2@mail.gmail.com>

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

Hi Pekka,

On Wed, 24 Jun 2009 10:40:48 +0300 Pekka Enberg <penberg@cs.helsinki.fi> wrote:
>
> 2009/6/24 Stephen Rothwell <sfr@canb.auug.org.au>:
> > The main obvious things left are:
> >
> > SLQB from the slab tree
> 
> This didn't make it to 2.6.31. Do you want me to drop it until -rc1 is out?

At this point, it hardly matters as I suspect -rc1 will be in the next
day or so.  Probably better to keep things stable for Andrew, so leave it
in, I guess.

-- 
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

* Re: Main things left in linux-next
From: Jeff Garzik @ 2009-06-24  7:43 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, LKML, Pekka Enberg, Christoph Lameter, Andrew Morton,
	Linus, Geert Uytterhoeven, Len Brown, Avi Kivity, Jens Axboe,
	Richard Purdie, Boaz Harrosh
In-Reply-To: <20090624172735.9b500674.sfr@canb.auug.org.au>

Stephen Rothwell wrote:
> The main obvious things left are:
> 
> osdblk from the osd tree


I thought Boaz pushed this one the other day...

	Jeff

^ permalink raw reply

* Re: Main things left in linux-next
From: Pekka Enberg @ 2009-06-24  7:40 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, LKML, Christoph Lameter, Andrew Morton, Linus,
	Nick Piggin
In-Reply-To: <20090624172735.9b500674.sfr@canb.auug.org.au>

Hi Stephen,

[ I'm trimming the cc list a bit. ]

2009/6/24 Stephen Rothwell <sfr@canb.auug.org.au>:
> The main obvious things left are:
>
> SLQB from the slab tree

This didn't make it to 2.6.31. Do you want me to drop it until -rc1 is out?

                                        Pekka

^ permalink raw reply

* Main things left in linux-next
From: Stephen Rothwell @ 2009-06-24  7:27 UTC (permalink / raw)
  To: linux-next
  Cc: LKML, Pekka Enberg, Christoph Lameter, Andrew Morton, Linus,
	Geert Uytterhoeven, Joel Becker,
	"Frédéric Weisbecker", Len Brown, Avi Kivity,
	Rusty Russell, Jens Axboe, Alasdair G Kergon, Anton Vorontsov,
	Richard Purdie, Boaz Harrosh, Jon Masters, Greg KH
In-Reply-To: <20090624164617.b7c49974.sfr@canb.auug.org.au>

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

Hi All,

$ git diff --shortstat -M stable..HEAD^
 587 files changed, 27313 insertions(+), 12317 deletions(-)

We seem to be going backwards :-( Yesterday's was:
 556 files changed, 27596 insertions(+), 7123 deletions(-)

$ git diff --dirstat -M stable..HEAD^
   4.9% Documentation/powerpc/dts-bindings/
   5.1% Documentation/powerpc/
   3.0% Documentation/vm/
   3.9% arch/sparc/
   3.9% arch/x86/kvm/
   4.4% arch/x86/
   6.9% drivers/md/
   4.7% drivers/misc/
   9.8% drivers/staging/et131x/
   4.3% drivers/staging/
   6.6% drivers/usb/otg/
  14.5% drivers/
   5.5% include/linux/
  12.6% mm/

The main obvious things left are:

SLQB from the slab tree
an m68k update
an ocfs2 update
the reiserfs kill-the-bkl effort
an acpi update
a kvm update
some more cpumask work from the rr tree
the writeback changes form the block tree
a device-mapper update
a battery tree update
a leds tree update
osdblk from the osd tree
the new hwlat tree
devtmpfs from the driver-core tree (hmmm?)

Please do not shoot the messenger. :-)
-- 
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

* linux-next: Tree for June 24
From: Stephen Rothwell @ 2009-06-24  6:46 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20090623:

My fixes tree contains these two commits:

	fbdev: work around old compiler bug
	UML: Fix some apparent bitrot (I am hoping to add some UML builds)

This tree fails to build for powerpc allyesconfig.

The rr tree gained a conflict against Linus' tree and a build failure for
which I reverted a commit.

The dwmw2-iommu lost its conflicts.

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

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 130 trees (counting Linus' and 19 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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

Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

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

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging 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
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
CONFLICT (content): Merge conflict in drivers/input/evdev.c
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (add/add): Merge conflict in drivers/staging/serqt_usb2/serqt_usb2.c
CONFLICT (content): Merge conflict in include/linux/rfkill.h
CONFLICT (content): Merge conflict in kernel/cpu.c
$ git reset --hard HEAD^
Merging refs/next/20090619/microblaze
Merging mips/mips-for-linux-next
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
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
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
CONFLICT (content): Merge conflict in kernel/cpu.c
Merging mmc/next
Merging input/next
Merging bkl-removal/bkl-removal
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
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 omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
Merging asm-generic/next
Merging quilt/driver-core
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master
Applying: UML: Fix some apparent bitrot
[master f968612] Revert "cpumask:use-mm_cpumask-arm"

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

^ permalink raw reply

* Re: linux-next: rr tree build failure
From: Stephen Rothwell @ 2009-06-24  6:31 UTC (permalink / raw)
  To: Rusty Russell; +Cc: linux-next, linux-kernel, Russell King
In-Reply-To: <200906241254.24945.rusty@rustcorp.com.au>

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

Hi Rusty,

On Wed, 24 Jun 2009 12:54:24 +0930 Rusty Russell <rusty@rustcorp.com.au> wrote:
>
> Dumb typo + cut & paste.
> 
> Fixed,

Thanks, I will pick it up tomorrow.  For today, I have reverted
"cpumask:use-mm_cpumask-arm".

-- 
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

* Re: linux-next: rr tree build failure
From: Rusty Russell @ 2009-06-24  3:24 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Russell King
In-Reply-To: <20090623161416.072b43ba.sfr@canb.auug.org.au>

On Tue, 23 Jun 2009 03:44:16 pm Stephen Rothwell wrote:
> Hi Rusty,
>
> Today's linux-next build (arm realview-smp_defconfig) failed like this:
>
> arch/arm/kernel/smp.c: In function 'flush_tlb_mm':
> arch/arm/kernel/smp.c:646: error: lvalue required as unary '&' operand
> arch/arm/kernel/smp.c: In function 'flush_tlb_page':
> arch/arm/kernel/smp.c:657: error: lvalue required as unary '&' operand
> arch/arm/kernel/smp.c: In function 'flush_tlb_range':
> arch/arm/kernel/smp.c:680: error: lvalue required as unary '&' operand

Dumb typo + cut & paste.

Fixed,
Rusty.

^ permalink raw reply

* linux-next: manual merge of the rr tree with Linus' tree
From: Stephen Rothwell @ 2009-06-24  3:08 UTC (permalink / raw)
  To: Rusty Russell; +Cc: linux-next, linux-kernel, Lai Jiangshan

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

Hi Rusty,

Today's linux-next merge of the rr tree got a conflict in kernel/cpu.c
between commit 31950eb66ff47c946fd9c65c2f8c94b6b7ba13fc ("mm/init:
cpu_hotplug_init() must be initialized before SLAB") from Linus' tree and
commit 7ad613eb4d867245f0964e395e6087ae7f126b95 ("cpuhotplug: remove
cpu_hotplug_init()") from the rr tree.

It looks like they are trying to do the same thing ... I used the version
from Linus' tree.
-- 
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

* Re: linux-next: driver-core tree build failure
From: Greg KH @ 2009-06-23 16:28 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Russell King
In-Reply-To: <20090623152916.GA27467@kroah.com>

On Tue, Jun 23, 2009 at 08:29:16AM -0700, Greg KH wrote:
> On Tue, Jun 23, 2009 at 04:01:00PM +1000, Stephen Rothwell wrote:
> > Hi Greg,
> > 
> > Today's linux-next build (arm omap_osk_5912_defconfig) failed like this:
> > 
> > drivers/video/omap/omapfb_main.c: In function 'omapfb_show_caps_num':
> > drivers/video/omap/omapfb_main.c:1253: error: 'struct device' has no member named 'driver_data'
> > drivers/video/omap/omapfb_main.c: In function 'omapfb_show_caps_text':
> > drivers/video/omap/omapfb_main.c:1273: error: 'struct device' has no member named 'driver_data'
> > drivers/video/omap/omapfb_main.c: In function 'omapfb_show_panel_name':
> > drivers/video/omap/omapfb_main.c:1320: error: 'struct device' has no member named 'driver_data'
> > drivers/video/omap/omapfb_main.c: In function 'omapfb_show_bklight_level':
> > drivers/video/omap/omapfb_main.c:1329: error: 'struct device' has no member named 'driver_data'
> > drivers/video/omap/omapfb_main.c: In function 'omapfb_store_bklight_level':
> > drivers/video/omap/omapfb_main.c:1344: error: 'struct device' has no member named 'driver_data'
> > drivers/video/omap/omapfb_main.c: In function 'omapfb_show_bklight_max':
> > drivers/video/omap/omapfb_main.c:1363: error: 'struct device' has no member named 'driver_data'
> > drivers/video/omap/omapfb_main.c: In function 'omapfb_show_ctrl_name':
> > drivers/video/omap/omapfb_main.c:1396: error: 'struct device' has no member named 'driver_data'
> > 
> > Caused by commit 53d8ba57f16029a47ed5df9840ab6c3f9abd3727 ("Driver core:
> > move dev_get/set_drvdata to drivers/base/dd.c") from the driver-core tree.
> > 
> > I see more grepping in your future :-)
> 
> Heh, thanks, I got i386, x86-64, and ppc64 working properly this time
> around, but new things keep slipping in :)
> 
> I'll go resolve these as well.

Now fixed and pushed out.

thanks,

greg k-h

^ permalink raw reply

* Re: linux-next: driver-core tree build failure
From: Greg KH @ 2009-06-23 15:29 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, linux-kernel, Russell King
In-Reply-To: <20090623160100.ab086e63.sfr@canb.auug.org.au>

On Tue, Jun 23, 2009 at 04:01:00PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next build (arm omap_osk_5912_defconfig) failed like this:
> 
> drivers/video/omap/omapfb_main.c: In function 'omapfb_show_caps_num':
> drivers/video/omap/omapfb_main.c:1253: error: 'struct device' has no member named 'driver_data'
> drivers/video/omap/omapfb_main.c: In function 'omapfb_show_caps_text':
> drivers/video/omap/omapfb_main.c:1273: error: 'struct device' has no member named 'driver_data'
> drivers/video/omap/omapfb_main.c: In function 'omapfb_show_panel_name':
> drivers/video/omap/omapfb_main.c:1320: error: 'struct device' has no member named 'driver_data'
> drivers/video/omap/omapfb_main.c: In function 'omapfb_show_bklight_level':
> drivers/video/omap/omapfb_main.c:1329: error: 'struct device' has no member named 'driver_data'
> drivers/video/omap/omapfb_main.c: In function 'omapfb_store_bklight_level':
> drivers/video/omap/omapfb_main.c:1344: error: 'struct device' has no member named 'driver_data'
> drivers/video/omap/omapfb_main.c: In function 'omapfb_show_bklight_max':
> drivers/video/omap/omapfb_main.c:1363: error: 'struct device' has no member named 'driver_data'
> drivers/video/omap/omapfb_main.c: In function 'omapfb_show_ctrl_name':
> drivers/video/omap/omapfb_main.c:1396: error: 'struct device' has no member named 'driver_data'
> 
> Caused by commit 53d8ba57f16029a47ed5df9840ab6c3f9abd3727 ("Driver core:
> move dev_get/set_drvdata to drivers/base/dd.c") from the driver-core tree.
> 
> I see more grepping in your future :-)

Heh, thanks, I got i386, x86-64, and ppc64 working properly this time
around, but new things keep slipping in :)

I'll go resolve these as well.

thanks,

greg k-h

^ permalink raw reply

* [PATCH] wm97xx_batery: replace driver_data with dev_get_drvdata()
From: Alexander Beregalov @ 2009-06-23 13:50 UTC (permalink / raw)
  To: linux-next, rmk+kernel; +Cc: gregkh, Alexander Beregalov

See commit 53d8ba57 (Driver core: move dev_get/set_drvdata to
drivers/base/dd.c)
Fix build.

Signed-off-by: Alexander Beregalov <a.beregalov@gmail.com>
---
 drivers/power/wm97xx_battery.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/power/wm97xx_battery.c b/drivers/power/wm97xx_battery.c
index 8bde921..b787335 100644
--- a/drivers/power/wm97xx_battery.c
+++ b/drivers/power/wm97xx_battery.c
@@ -33,14 +33,14 @@ static enum power_supply_property *prop;
 
 static unsigned long wm97xx_read_bat(struct power_supply *bat_ps)
 {
-	return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
+	return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
 					pdata->batt_aux) * pdata->batt_mult /
 					pdata->batt_div;
 }
 
 static unsigned long wm97xx_read_temp(struct power_supply *bat_ps)
 {
-	return wm97xx_read_aux_adc(bat_ps->dev->parent->driver_data,
+	return wm97xx_read_aux_adc(dev_get_drvdata(bat_ps->dev->parent),
 					pdata->temp_aux) * pdata->temp_mult /
 					pdata->temp_div;
 }
-- 
1.6.3.1

^ permalink raw reply related

* Re: linux-next: kvm tree build failure
From: Avi Kivity @ 2009-06-23 10:23 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: linux-next, linux-kernel, Marcelo Tosatti, Martin Schwidefsky,
	Heiko Carstens, Christian Bornträger
In-Reply-To: <20090623155345.11219074.sfr@canb.auug.org.au>

On 06/23/2009 08:53 AM, Stephen Rothwell wrote:
> Hi Avi,
>
> Today's linux-next build (s390 allmodconfig) failed like this:
>
> In file included from include/trace/ftrace.h:261,
>                   from include/trace/define_trace.h:56,
>                   from include/trace/events/kvm.h:55,
>                   from arch/s390/kvm/../../../virt/kvm/kvm_main.c:63:
> include/trace/events/kvm.h: In function 'ftrace_raw_output_kvm_ack_irq':
> include/trace/events/kvm.h:31: error: 'KVM_IRQCHIP_PIC_MASTER' undeclared (first use in this function)
> include/trace/events/kvm.h:31: error: (Each undeclared identifier is reported only once
> include/trace/events/kvm.h:31: error: for each function it appears in.)
> include/trace/events/kvm.h:31: error: 'KVM_IRQCHIP_PIC_SLAVE' undeclared (first use in this function)
> include/trace/events/kvm.h:31: error: 'KVM_IRQCHIP_IOAPIC' undeclared (first use in this function)
>
> Caused by commit acb57be20f6b600848a99796d8f115ec079b8b08 ("KVM: convert
> custom marker based tracing to event traces").
>
>    

I applied a patch from Christian Borntraeger addressing this.

-- 
error compiling committee.c: too many arguments to function

^ permalink raw reply

* Re: linux-next: origin tree build failure
From: Mark Brown @ 2009-06-23 10:13 UTC (permalink / raw)
  To: Stephen Rothwell
  Cc: Russell King, linux-next, linux-kernel, Andy Green, Ben Dooks,
	Michel Pollet
In-Reply-To: <20090623162223.55b9880c.sfr@canb.auug.org.au>

This should fix it, I'll submit to the patch system immediately.

>From 196ab1662fc5561ca304bb4d08160f085a8f171d Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Tue, 23 Jun 2009 11:08:08 +0100
Subject: [PATCH] [ARM] S3C24XX: Declare device for IIS ports

Though the device is not actually used by the drivers on S3C24xx CPUs
some platforms register it causing build failures.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
---
 arch/arm/plat-s3c/include/plat/devs.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/arch/arm/plat-s3c/include/plat/devs.h b/arch/arm/plat-s3c/include/plat/devs.h
index b5b9c4d..71a6b0e 100644
--- a/arch/arm/plat-s3c/include/plat/devs.h
+++ b/arch/arm/plat-s3c/include/plat/devs.h
@@ -34,6 +34,7 @@ extern struct platform_device s3c_device_lcd;
 extern struct platform_device s3c_device_wdt;
 extern struct platform_device s3c_device_i2c0;
 extern struct platform_device s3c_device_i2c1;
+extern struct platform_device s3c_device_iis;
 extern struct platform_device s3c_device_rtc;
 extern struct platform_device s3c_device_adc;
 extern struct platform_device s3c_device_sdi;
-- 
1.6.3.1

^ permalink raw reply related

* Re: linux-next: Tree for June 19
From: Stephen Rothwell @ 2009-06-23  8:54 UTC (permalink / raw)
  To: Len Brown; +Cc: linux-next, LKML, sfi-devel
In-Reply-To: <alpine.LFD.2.00.0906230227250.5879@localhost.localdomain>

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

Hi Len,

On Tue, 23 Jun 2009 02:34:07 -0400 (EDT) Len Brown <lenb@kernel.org> wrote:
>
> On second though, I'll wait for 2.6.32 merge window to push upstream.
> 
> So go ahead and delay pulling sfi-test until after 2.6.31-rc1 is declared.

OK, queued.

-- 
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

* Re: linux-next: Tree for June 19
From: Len Brown @ 2009-06-23  6:34 UTC (permalink / raw)
  To: Stephen Rothwell; +Cc: linux-next, LKML, sfi-devel
In-Reply-To: <alpine.LFD.2.00.0906201415400.4083@localhost.localdomain>

>>> git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-sfi-2.6.git sfi-test

>>> A description of the project is on the SFI home page: 
>>> http://simplefirmware.org/

>> Is this 2.6.31 or 32 material?

Hi Stephen,

On second though, I'll wait for 2.6.32 merge window to push upstream.

So go ahead and delay pulling sfi-test until after 2.6.31-rc1 is declared.

thanks,
-Len Brown, Intel Open Source Technology Center

^ permalink raw reply

* linux-next: origin tree build failure
From: Stephen Rothwell @ 2009-06-23  6:22 UTC (permalink / raw)
  To: Russell King
  Cc: linux-next, linux-kernel, Mark Brown, Andy Green, Ben Dooks,
	Michel Pollet

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

Hi Russell,

Today's linux-next build (arm s3c2410_defconfig) failed like this:

arch/arm/mach-s3c2410/mach-smdk2410.c:94: error: 's3c_device_iis' undeclared here (not in a function)
arch/arm/mach-s3c2410/mach-h1940.c:189: error: 's3c_device_iis' undeclared here (not in a function)
arch/arm/mach-s3c2440/mach-rx3715.c:183: error: 's3c_device_iis' undeclared here (not in a function)
arch/arm/mach-s3c2412/mach-smdk2413.c:111: error: 's3c_device_iis' undeclared here (not in a function)
arch/arm/mach-s3c2440/mach-smdk2440.c:157: error: 's3c_device_iis' undeclared here (not in a function)
arch/arm/mach-s3c2412/mach-vstms.c:127: error: 's3c_device_iis' undeclared here (not in a function)
rch/arm/mach-s3c2440/mach-nexcoder.c:113: error: 's3c_device_iis' undeclared here (not in a function)

Probably caused by commit 52da219e9664e537a745877b0efa7cf2b1ff2996
("[ARM] S3C64XX: Provide device for IIS ports");

-- 
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

* linux-next: rr tree build failure
From: Stephen Rothwell @ 2009-06-23  6:14 UTC (permalink / raw)
  To: Rusty Russell; +Cc: linux-next, linux-kernel, Russell King

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

Hi Rusty,

Today's linux-next build (arm realview-smp_defconfig) failed like this:

arch/arm/kernel/smp.c: In function 'flush_tlb_mm':
arch/arm/kernel/smp.c:646: error: lvalue required as unary '&' operand
arch/arm/kernel/smp.c: In function 'flush_tlb_page':
arch/arm/kernel/smp.c:657: error: lvalue required as unary '&' operand
arch/arm/kernel/smp.c: In function 'flush_tlb_range':
arch/arm/kernel/smp.c:680: error: lvalue required as unary '&' operand

Caused by commit e97df8b735e20500a1d6a3743bef153869c472d3
("cpumask:use-mm_cpumask-arm").

-- 
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

* Re: [ofa-general] Re: linux-next: origin tree build warning
From: Roland Dreier @ 2009-06-23  6:10 UTC (permalink / raw)
  To: FUJITA Tomonori; +Cc: sfr, linux-next, linux-kernel, general
In-Reply-To: <20090622121054K.fujita.tomonori@lab.ntt.co.jp>

Thanks, I queued up:

commit 99987bea474ceca8ec6fb05f81d7d188634cdffd
Author: Roland Dreier <rolandd@cisco.com>
Date:   Mon Jun 22 23:04:13 2009 -0700

    IB/mthca: Replace dma_sync_single() use with proper functions
    
    dma_sync_single() is deprecated now, and the use in mthca is wrong:
    there should be a dma_sync_single_for_cpu() before touching the memory
    from the CPU, and a dma_sync_single_for_device() afterwards.  Fix
    this, prompted by a kick in the pants from a patch from FUJITA
    Tomonori <fujita.tomonori@lab.ntt.co.jp>.
    
    Signed-off-by: Roland Dreier <rolandd@cisco.com>

diff --git a/drivers/infiniband/hw/mthca/mthca_mr.c b/drivers/infiniband/hw/mthca/mthca_mr.c
index d606edf..065b208 100644
--- a/drivers/infiniband/hw/mthca/mthca_mr.c
+++ b/drivers/infiniband/hw/mthca/mthca_mr.c
@@ -352,10 +352,14 @@ static void mthca_arbel_write_mtt_seg(struct mthca_dev *dev,
 
 	BUG_ON(!mtts);
 
+	dma_sync_single_for_cpu(&dev->pdev->dev, dma_handle,
+				list_len * sizeof (u64), DMA_TO_DEVICE);
+
 	for (i = 0; i < list_len; ++i)
 		mtts[i] = cpu_to_be64(buffer_list[i] | MTHCA_MTT_FLAG_PRESENT);
 
-	dma_sync_single(&dev->pdev->dev, dma_handle, list_len * sizeof (u64), DMA_TO_DEVICE);
+	dma_sync_single_for_device(&dev->pdev->dev, dma_handle,
+				   list_len * sizeof (u64), DMA_TO_DEVICE);
 }
 
 int mthca_write_mtt(struct mthca_dev *dev, struct mthca_mtt *mtt,
@@ -803,12 +807,15 @@ int mthca_arbel_map_phys_fmr(struct ib_fmr *ibfmr, u64 *page_list,
 
 	wmb();
 
+	dma_sync_single_for_cpu(&dev->pdev->dev, fmr->mem.arbel.dma_handle,
+				list_len * sizeof(u64), DMA_TO_DEVICE);
+
 	for (i = 0; i < list_len; ++i)
 		fmr->mem.arbel.mtts[i] = cpu_to_be64(page_list[i] |
 						     MTHCA_MTT_FLAG_PRESENT);
 
-	dma_sync_single(&dev->pdev->dev, fmr->mem.arbel.dma_handle,
-			list_len * sizeof(u64), DMA_TO_DEVICE);
+	dma_sync_single_for_device(&dev->pdev->dev, fmr->mem.arbel.dma_handle,
+				   list_len * sizeof(u64), DMA_TO_DEVICE);
 
 	fmr->mem.arbel.mpt->key    = cpu_to_be32(key);
 	fmr->mem.arbel.mpt->lkey   = cpu_to_be32(key);

^ permalink raw reply related

* Re: linux-next: Tree for June 23
From: Stephen Rothwell @ 2009-06-23  6:07 UTC (permalink / raw)
  To: linux-next; +Cc: LKML
In-Reply-To: <20090623153357.61f4a9a2.sfr@canb.auug.org.au>

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

$ git diff --shortstat -M stable..HEAD^
 556 files changed, 27596 insertions(+), 7123 deletions(-)
$ git diff --dirstat -M stable..HEAD^
   3.8% Documentation/vm/
   4.8% arch/x86/kvm/
   5.4% arch/x86/
   3.4% drivers/acpi/
   7.5% drivers/firewire/
   8.5% drivers/md/
   5.8% drivers/misc/
   4.3% drivers/scsi/
   6.9% drivers/watchdog/
  15.3% drivers/
   3.4% fs/
   6.1% include/linux/
  15.5% mm/

-- 
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

* linux-next: driver-core tree build failure
From: Stephen Rothwell @ 2009-06-23  6:01 UTC (permalink / raw)
  To: Greg KH; +Cc: linux-next, linux-kernel, Russell King

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

Hi Greg,

Today's linux-next build (arm omap_osk_5912_defconfig) failed like this:

drivers/video/omap/omapfb_main.c: In function 'omapfb_show_caps_num':
drivers/video/omap/omapfb_main.c:1253: error: 'struct device' has no member named 'driver_data'
drivers/video/omap/omapfb_main.c: In function 'omapfb_show_caps_text':
drivers/video/omap/omapfb_main.c:1273: error: 'struct device' has no member named 'driver_data'
drivers/video/omap/omapfb_main.c: In function 'omapfb_show_panel_name':
drivers/video/omap/omapfb_main.c:1320: error: 'struct device' has no member named 'driver_data'
drivers/video/omap/omapfb_main.c: In function 'omapfb_show_bklight_level':
drivers/video/omap/omapfb_main.c:1329: error: 'struct device' has no member named 'driver_data'
drivers/video/omap/omapfb_main.c: In function 'omapfb_store_bklight_level':
drivers/video/omap/omapfb_main.c:1344: error: 'struct device' has no member named 'driver_data'
drivers/video/omap/omapfb_main.c: In function 'omapfb_show_bklight_max':
drivers/video/omap/omapfb_main.c:1363: error: 'struct device' has no member named 'driver_data'
drivers/video/omap/omapfb_main.c: In function 'omapfb_show_ctrl_name':
drivers/video/omap/omapfb_main.c:1396: error: 'struct device' has no member named 'driver_data'

Caused by commit 53d8ba57f16029a47ed5df9840ab6c3f9abd3727 ("Driver core:
move dev_get/set_drvdata to drivers/base/dd.c") from the driver-core tree.

I see more grepping in your future :-)
-- 
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

* linux-next: kvm tree build failure
From: Stephen Rothwell @ 2009-06-23  5:53 UTC (permalink / raw)
  To: Avi Kivity
  Cc: linux-next, linux-kernel, Marcelo Tosatti, Martin Schwidefsky,
	Heiko Carstens

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

Hi Avi,

Today's linux-next build (s390 allmodconfig) failed like this:

In file included from include/trace/ftrace.h:261,
                 from include/trace/define_trace.h:56,
                 from include/trace/events/kvm.h:55,
                 from arch/s390/kvm/../../../virt/kvm/kvm_main.c:63:
include/trace/events/kvm.h: In function 'ftrace_raw_output_kvm_ack_irq':
include/trace/events/kvm.h:31: error: 'KVM_IRQCHIP_PIC_MASTER' undeclared (first use in this function)
include/trace/events/kvm.h:31: error: (Each undeclared identifier is reported only once
include/trace/events/kvm.h:31: error: for each function it appears in.)
include/trace/events/kvm.h:31: error: 'KVM_IRQCHIP_PIC_SLAVE' undeclared (first use in this function)
include/trace/events/kvm.h:31: error: 'KVM_IRQCHIP_IOAPIC' undeclared (first use in this function)

Caused by commit acb57be20f6b600848a99796d8f115ec079b8b08 ("KVM: convert
custom marker based tracing to event traces").

-- 
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

* linux-next: Tree for June 23
From: Stephen Rothwell @ 2009-06-23  5:33 UTC (permalink / raw)
  To: linux-next; +Cc: LKML

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

Hi all,

Changes since 20090622:

My fixes tree contains this one commit:

	fbdev: work around old compiler bug (this works around a bug in
old compilers).

This tree fails to build for powerpc allyesconfig.

The slab tree lost its conflict and build failure.

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

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 130 trees (counting Linus' and 19 trees of patches pending for
Linus' tree), more are welcome (even if they are currently empty).
Thanks to those who have contributed, and to those who haven't, please do.

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

Thanks to Jan Dittmer for adding the linux-next tree to his build tests
at http://l4x.org/k/ , the guys at http://test.kernel.org/ and Randy
Dunlap for doing many randconfig builds.

There is a wiki covering stuff to do with linux-next at
http://linux.f-seidel.de/linux-next/pmwiki/ .  Thanks to Frank Seidel.

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

$ git checkout master
$ git reset --hard stable
Merging origin/master
Merging fixes/fixes
Merging arm-current/master
Merging m68k-current/for-linus
Merging powerpc-merge/merge
Merging sparc-current/master
Merging scsi-rc-fixes/master
Merging net-current/master
Merging sound-current/for-linus
Merging pci-current/for-linus
Merging wireless-current/master
Merging kbuild-current/master
Merging quilt/driver-core.current
Merging quilt/usb.current
Merging cpufreq-current/fixes
Merging input-current/for-linus
Merging md-current/for-linus
Merging audit-current/for-linus
Merging crypto-current/master
Merging dwmw2/master
Merging arm/devel
Merging davinci/for-next
Merging pxa/for-next
Merging 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
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
CONFLICT (content): Merge conflict in drivers/input/evdev.c
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
CONFLICT (content): Merge conflict in drivers/staging/Kconfig
CONFLICT (content): Merge conflict in drivers/staging/Makefile
CONFLICT (add/add): Merge conflict in drivers/staging/serqt_usb2/serqt_usb2.c
CONFLICT (content): Merge conflict in include/linux/rfkill.h
$ git reset --hard HEAD^
Merging refs/next/20090619/microblaze
Merging mips/mips-for-linux-next
CONFLICT (add/add): Merge conflict in arch/mips/cavium-octeon/executive/cvmx-helper-errata.c
CONFLICT (content): Merge conflict in arch/mips/mm/tlbex.c
CONFLICT (content): Merge conflict in arch/mips/sibyte/swarm/setup.c
CONFLICT (content): Merge conflict in drivers/char/hw_random/Kconfig
CONFLICT (content): Merge conflict in drivers/char/hw_random/Makefile
Merging parisc/master
Merging powerpc/next
Merging 4xx/next
Merging galak/next
Merging s390/features
Merging sh/master
Merging sparc/master
Merging xtensa/master
Merging cifs/master
Merging configfs/linux-next
CONFLICT (content): Merge conflict in fs/configfs/dir.c
Merging ext4/next
Merging fatfs/master
Merging fuse/for-next
Merging gfs2/master
Merging jfs/next
Merging nfs/linux-next
Merging nfsd/nfsd-next
Merging nilfs2/for-next
Merging ocfs2/linux-next
Merging squashfs/master
Merging v9fs/for-next
CONFLICT (content): Merge conflict in net/9p/protocol.c
Merging ubifs/linux-next
Merging xfs/master
Merging reiserfs-bkl/reiserfs/kill-bkl-rc6
CONFLICT (content): Merge conflict in fs/reiserfs/super.c
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
Merging quota/for_next
Merging kbuild/master
Merging ide/master
Merging libata/NEXT
Merging infiniband/for-next
Merging acpi/test
CONFLICT (content): Merge conflict in drivers/platform/x86/eeepc-laptop.c
Merging ieee1394/for-next
Merging ubi/linux-next
Merging kvm/master
Merging dlm/next
Merging scsi/master
Merging async_tx/next
Merging udf/for_next
Merging net/master
Merging wireless/master
Merging mtd/master
Merging crypto/master
Merging sound/for-next
Merging cpufreq/next
Merging quilt/rr
Merging mmc/next
Merging input/next
Merging bkl-removal/bkl-removal
Merging lsm/for-next
Merging block/for-next
Merging quilt/device-mapper
Merging embedded/master
Merging firmware/master
Merging pcmcia/master
Merging battery/master
Merging leds/for-mm
Merging backlight/for-mm
Merging kgdb/kgdb-next
Merging slab/for-next
Merging uclinux/for-next
Merging md/for-next
Merging mfd/for-next
Merging hdlc/hdlc-next
Merging drm/drm-next
Merging voltage/for-next
Merging security-testing/next
Merging lblnet/master
Merging quilt/ttydev
Merging agp/agp-next
Merging uwb/for-upstream
Merging watchdog/master
Merging bdev/master
Merging dwmw2-iommu/master
CONFLICT (content): Merge conflict in drivers/pci/intel-iommu.c
CONFLICT (content): Merge conflict in drivers/pci/intr_remapping.c
Merging cputime/cputime
Merging osd/linux-next
Merging jc_docs/docs-next
Merging nommu/master
Merging trivial/for-next
Merging audit/for-next
Merging omap/for-next
Merging quilt/aoe
Merging suspend/linux-next
Merging bluetooth/master
Merging edac-amd/for-next
Merging fsnotify/for-next
Merging irda/for-next
Merging hwlat/for-linus
Merging tip/auto-latest
CONFLICT (content): Merge conflict in arch/x86/mm/fault.c
Merging asm-generic/next
Merging quilt/driver-core
Merging quilt/usb
Merging quilt/staging
Merging scsi-post-merge/master

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

^ permalink raw reply


This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox