linux-next: manual merge of the akpm tree with the tip tree

intel_uncore.h: make UNCORE_PMU_HRTIMER_INTERVAL 64-bit" from the akpm tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/x86/kernel/cpu/perf_event_intel_uncore.h index f385189,d85c25

linux-next: manual merge of the akpm tree with Linus' tree

ix fallout" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/btrfs/relocation.c index c5dbd91,790f492..000 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@@ -1239,1

linux-next: Tree for July 27

s open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. 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

linux-next: manual merge of the vfs tree with Linus' tree

om the vfs tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/staging/gdm72xx/usb_boot.c index fef290c,b366a54..000 --- a/drivers/staging/gdm72xx/usb_boot.c +++ b/driv

linux-next: manual merge of the vfs tree with Linus' tree

an up") from the vfs tree. Context changes. I fixed it up (I think - see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/usb/gadget/storage_common.c index ae8b188,f929432..000 --- a/drivers/usb/gadget/stor

linux-next: manual merge of the arm-soc tree with Linus' tree

) from the arm-soc tree. Just context changes. I fixed it up (see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/watchdog/orion_wdt.c index a73bea4,1531e02..000 --- a/drivers/watchdog/orion_wdt.c +++ b/drivers/

linux-next: Tree for July 30

linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (f7da9cd Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging fixes/ma

linux-next: manual merge of the ceph tree with Linus' tree

ed it up (removed the calls to ceph_con_out_kvec_reset()) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpTroELdxT9c.pgp Description: PGP signature

linux-next: manual merge of the bjdooks-i2c tree with Linus' tree

nd since the bjdooks-i2c tree has not been updated since May 3 and I have been unable to access it for some time, I just dropped it for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpJiqq3LHiJW.pgp Description: PGP signature

linux-next: manual merge of the akpm tree with the nfs tree

m the akpm tree. Just context changes? I fixed it up (I think - see below) and can carry the fix as necessary. -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/sunrpc/xprtsock.c index 9266794,83bb0eb..000 --- a/net/sunrpc/xprtsock.c +++ b/net/sunrpc/xprtsock.c

linux-next: build failure after merge of the akpm tree

icit-function-declaration] Caused by commit 753b960e52b7 ("rbtree: empty nodes have no color") from the akpm tree interacting with commit cd43045c2de6 ("libceph: initialize rb, list nodes in ceph_osd_request") from the ceph tree. I added the following merge fix patch for today: From

linux-next: build failure after merge of the final tree

Fix an s5m8767 build failure") from Linus' tree which I have cherry picked for today. This was reported a couple of weeks ago when it caused a merge conflict in linux-next. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpDLatn5vhff.pgp Description: PGP signature

linux-next: Tree for July 31

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. And to Paul Gortmaker for triage and bug fixes. There is a wiki covering stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ .

Re: linux-next: build failure after merge of the akpm tree

In this case it is git://github.com/ceph/ceph-client.git#master . -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpEt6O9QAjsa.pgp Description: PGP signature

linux-next: manual merge of the md tree with the block tree

ow) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/md/raid0.c index a9e4fa9,1a8e5e3..000 --- a/drivers/md/raid0.c +++ b/drivers/md/raid0.c @@@ -422,7 -431,7 +431,8 @@@ static int raid0_run(stru

linux-next: manual merge of the md tree with the tree

t up (I think - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/bio.c index f855e0e,dbb7a6c..000 --- a/fs/bio.c +++ b/fs/bio.c @@@ -1485,20 -1511,19 +1485,21 @@@ struct bio_pair *bio_spli

linux-next: manual merge of the battery tree with the mfd tree

t;) from the battery tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc include/linux/mfd/88pm860x.h index d515e5c,b7c5a3c..000 --- a/include/linux/mfd/88pm860x.h +++ b/inc

linux-next: build failure after merge of the akpm tree

on to contain file names of mapped files". Forgot to include vmalloc.h :-( I added this patch for today: From: Stephen Rothwell Date: Fri, 21 Sep 2012 16:06:18 +1000 Subject: [PATCH] coredump: using vmalloc requires the inclusion of vmalloc.h Signed-off-by: Stephen Rothwell --- fs/binfm

linux-next: build failure after merge of the akpm tree

t follow it) for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp2L3VNCM2PL.pgp Description: PGP signature

linux-next: build failure after merge of the final tree (mfd and battery trees related)

following merge-fix patch and can carry it as necessary. From: Stephen Rothwell Date: Fri, 21 Sep 2012 16:41:09 +1000 Subject: [PATCH] power_supply: 88pm860x: fix up for mfd_add_devices() API change Signed-off-by: Stephen Rothwell --- drivers/mfd/88pm860x-core.c |2 +- 1 file changed, 1 insertio

Re: linux-next: build failure after merge of the final tree (mfd and battery trees related)

Hi all, On Fri, 21 Sep 2012 16:48:19 +1000 Stephen Rothwell wrote: > > After merging the final tree, today's linux-next build (powerpc > allyesconfig) failed like this: > > drivers/mfd/88pm860x-core.c: In function 'device_power_init': > drivers/mfd/88pm8

linux-next: Tree for Sept 21

re always open to add more builds. Thanks to Randy Dunlap for doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. 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 Roth

Re: Helping with backports: linux-next, linux, linux-stable - a few enhancements

ify it if I can for users. If they fetch from your tree, and your tree has Linus' tree and linux-next and linux-stable in it (and you have local tracking branches for those trees, or they explicitly use --tags when they fetch) then they will get all that from you. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpn4sR3OVmwf.pgp Description: PGP signature

Re: mmotm 2012-09-20-17-25 uploaded (fs/bimfmt_elf on uml)

warning: assignment makes pointer from integer > without a cast > fs/binfmt_elf.c:1437:5: error: implicit declaration of function 'vfree' reported in linux-next (offending patch reverted for other problems). -- Cheers, Stephen Rothwells...@canb.auug.org.au

linux-next: manual merge of the vfs tree with the tree

t to fdget") from the vfs tree. I just used the vfs tree version and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp9n461WWp0w.pgp Description: PGP signature

linux-next: manual merge of the vfs tree with Linus' tree

the vfs tree. I just used the vfs tree version and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpowxCFvUvtH.pgp Description: PGP signature

Re: Linux 3.6-rc7

ned for the merge window (i.e. 3.7) should be in linux-next by now and maintainers will spend the new week just testing what they have (and not unnecessarily rebasing their trees) and being prepared to inundate Linus as soon as he releases 3.6. And pigs might fly :-) -- Cheers,

linux-next: build failure after merge of the drm tree

nction) Caused by commit b98b60167279 ("drm/i915: HDMI - Clear Audio Enable bit for Hot Plug") from Linus' tree interacting with commit 5ab432ef4997 ("drm/i915/hdmi: convert to encoder->disable/enable") from the drm tree. I added the following merge fix patch (which may be wrong, o

linux-next: build failure after merge of the sound and sound-asoc trees

ice_prep_dma_cyclic() callback"). Was this version of this patch build tested at all? I have used the sound and sound-asoc trees from next-20120921 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpGVRuyloJJJ.pgp Description: PGP signature

linux-next: manual merge of the edac tree with Linus' tree

ot assume mem_ctl_info is registered in sysfs") from the edac tree. Two versions of the same patch. I just used the version from the edac tree and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpWSd1NV6n6Y.pgp Description: PGP signature

linux-next: manual merge of the tty tree with the workqueues tree

from suspend/resume") from the tty tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/tty/serial/omap-serial.c index 0952d71,3c05c5e..000 --- a/drivers/tty/s

linux-next: manual merge of the usb tree with the acpi tree

the usb tree. The latter removed the function changed by the former, so I just did that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpmz5jPsrrJg.pgp Description: PGP signature

Re: linux-next: manual merge of the usb tree with the acpi tree

Hi Greg, On Mon, 24 Sep 2012 16:49:16 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the usb tree got a conflict in > drivers/usb/core/usb-acpi.c between commit 59e6423ba8aa ("usb-acpi: > Comply with the ACPI API change") from the acpi tree and commi

linux-next: manual merge of the staging tree with the vfs tree

c") and bf2023614201 ("Staging: android: binder: Remove an inconsequential conditional macro") from the staging tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --

linux-next: manual merge of the arm-soc tree with the sound tree

: move platform_data definitions") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/mach-davinci/davinci.h index 8661b20,a37fc44..000 --- a/arch/a

linux-next: manual merge of the arm-soc tree with the sound tree

: move platform_data definitions") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/mach-davinci/dm355.c index e47a3f0,adbde33..000 --- a/arch/arm/m

linux-next: manual merge of the arm-soc tree with the sound tree

orm_data definitions") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/mach-davinci/dm365.c index f473745,719e22f..000 --- a/arch/arm/mach-d

linux-next: manual merge of the arm-soc tree with the sound tree

t;ARM: davinci: move platform_data definitions") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/mach-davinci/include/mach/da8xx.h index c74a6ab,33e78a

linux-next: manual merge of the arm-soc tree with the v4l-dvb tree

: move platform_data definitions") and 606281525fb7 ("ARM: OMAP2+: Make gpmc-smc91x.h local") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff

linux-next: manual merge of the arm-soc tree with the fbdev tree

: move platform_data definitions") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/mach-s3c64xx/mach-mini6410.c index 96ebcc5,09311cc..00

linux-next: manual merge of the arm-soc tree with the fbdev tree

: move platform_data definitions") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/mach-s3c64xx/mach-real6410.c index 76d3ffb,6daca20..000 --

linux-next: manual merge of the arm-soc tree with the pm tree

shmobile SMP to SMP operations") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/mach-shmobile/include/mach/common.h index eb89293,f80f9c5..00

linux-next: manual merge of the arm-soc tree with the arm64 tree

xed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/clocksource/Makefile index 6591990,d496a55..000 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile @@@

linux-next: manual merge of the arm-soc tree with the slave-dma tree

tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/dma/mmp_tdma.c index b93d73c,07fa486..000 --- a/drivers/dma/mmp_tdma.c +++ b/drivers/dma/mmp_tdma.c @@@ -19,8 -

linux-next: manual merge of the arm-soc tree with the slave-dma tree

t;) from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/mmc/host/davinci_mmc.c index c5e1eeb,3dfd347..000 --- a/drivers/mmc/host/davinci_mmc

linux-next: manual merge of the arm-soc tree with the mmc tree

c3122f ("ARM: OMAP1: Make plat/mux.h omap1 only") from the arm-soc tree. The former removed a superset of include files, so I did that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp5s8YY79FMA.pgp Description: PGP signature

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/mtd/nand/orion_nand.c index 9ee436d,131b58a..000 --- a/drivers/mtd/nand/orion_nand.c +++ b/drivers/mtd/na

linux-next: manual merge of the arm-soc tree with the slave-dma tree

from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/spi/spi-davinci.c index c1ec52d,3afe2f4..000 --- a/drivers/spi/spi-davinci.c +++ b/drivers/sp

linux-next: manual merge of the arm-soc tree with the fbdev tree

"ARM: msm: move platform_data definitions") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/video/msm/mddi.c index d43e178,bf73f04..000 --- a

linux-next: manual merge of the arm-soc tree with the omap_dss2 tree

t;) from the arm-soc tree. The latter removed a superset of the former (as far as include files is concerned), so I used that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpPKxk6hqvY1.pgp Description: PGP signature

linux-next: manual merge of the samsung tree with the arm-soc tree

g Trats board") from the samsung tree. I removed the bit from Makefile.boot and added the following merge fix patch and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Mon, 24 Sep 2012 20:47:44 +1000 Subject: [PATCH] ARM: fix up for movemment of dtb target

linux-next: manual merge of the userns tree with the tree

143fecb33 ("audit: Remove the unused uid parameter from audit_receive_filter") from the userns tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc kernel/audit.c i

linux-next: manual merge of the userns tree with the ubifs tree

I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/ubifs/debug.c index 2714e02,340d1af..000 --- a/fs/ubifs/debug.c +++ b/fs/ubifs/debug.c @@@ -238,38 -238,38 +238,38 @@@ voi

linux-next: manual merge of the userns tree with the security tree

2 ("userns: Convert audit to work with user namespaces enabled") from the userns tree. I fixed it up (I think - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc kernel/auditsc.c index 37

linux-next: manual merge of the userns tree with the security tree

rt to IMA") from the userns tree. I fixed it up (see below) but it probably needs more and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc security/integrity/ima/ima_policy.c index cda9031,c84df05..000 ---

Re: linux-next: build failure after merge of the drm tree

erge, make sure that it is properly commented. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpp6NqeLI7LB.pgp Description: PGP signature

Re: linux-next: manual merge of the userns tree with the security tree

Hi, On Mon, 24 Sep 2012 21:41:16 +1000 Stephen Rothwell wrote: > > diff --cc kernel/auditsc.c > index 37f52f2,ff4798f..000 > --- a/kernel/auditsc.c > +++ b/kernel/auditsc.c > @@@ -1160,32 -1151,8 +1152,38 @@@ void audit_log_task_info(struct audit_b > char

linux-next: build failure after merge of the userns tree

cessary. From 55a9ee70146f37c559333b1f35154618c708203f Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Mon, 24 Sep 2012 22:05:38 +1000 Subject: [PATCH] audit: fix up for pid to portid change Signed-off-by: Stephen Rothwell --- kernel/audit.c |2 +- 1 file changed, 1 insertion(+), 1 de

linux-next: manual merge of the signal tree with the arm tree

xed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/include/asm/thread_info.h index f71cdab,b2d6b41..000 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm

linux-next: manual merge of the akpm tree with the userns tree

xed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc include/linux/audit.h index a7a7db9,5c186a5..000 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@@ -627,38 -624,95 +627,

linux-next: manual merge of the akpm tree with the vfs tree

ed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc mm/nommu.c index 98318dc,5583325..000 --- a/mm/nommu.c +++ b/mm/nommu.c @@@ -1282,12 -1279,10 +1279,8 @@@ unsigned long do_mmap_

linux-next: manual merge of the akpm tree with the vfs tree

pm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/ia64/kernel/perfmon.c index f388b4e,2eae90e..000 --- a/arch/ia64/kernel/perfmon.c +++ b/arch/ia64/kernel/perfmon.c

linux-next: manual merge of the akpm tree with the tree

ve core dump functionality into its own file" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/exec.c index 6b2e20b,d9bd87b..000 --- a/fs/exec.c ++

linux-next: manual merge of the akpm tree with the vfs tree

m the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 67925a7..863b8c7 100644 --- a/fs/proc/internal.h +++ b/fs/proc/in

linux-next: manual merge of the akpm tree with the tree

fixes" from the akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --git a/fs/proc/internal.h b/fs/proc/internal.h index 863b8c7..cceaab0 100644 --- a/fs/proc/internal.h

linux-next: build failure after merge of the akpm tree

nction) Caused by commit d7a4e9b679e9 ("IB/mlx4: Add CM paravirtualization") from the infiniband tree interacting with commit "idr: rename MAX_LEVEL to MAX_IDR_LEVEL" from the akpm tree. I have added the following merge fix patch for today: From: Stephen Rothwell Date: Mon, 24 Sep

linux-next: build failure after merge of the final tree (staging tree related)

tion-declaration] Caused by commit 0b52b7497271 ("staging: Add dgrp driver for Digi Realport devices"). I have added this fix patch for today: From: Stephen Rothwell Date: Tue, 25 Sep 2012 00:27:11 +1000 Subject: [PATCH] staging: dgrp: using vmalloc needs to include vmalloc.h Signed-off-by

linux-next: build failure after merge of the final tree (tty tree related)

ed by commit 84c3b8486044 ("compat_ioctl: Add RS-485 IOCTLs to the list") from the tty tree. I have reverted that commit for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpa3a0OVpaQh.pgp Description: PGP signature

linux-next: Tree for Sept 24

or triage and bug fixes. 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 Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging orig

Re: linux-next: Tree for Sept 24 (irqchip)

Hi Randy, On Mon, 24 Sep 2012 08:39:05 -0700 Randy Dunlap wrote: > > On 09/24/2012 07:53 AM, Stephen Rothwell wrote: > > > Today was a train wreck, with lots of new conflicts across several trees > > and a few build failures as well. > > I agree. I mostly get thi

linux-next: bluetooth tree rewritten after being merged

specifically a tree that is never meant to be stable). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpIrL86MyYzg.pgp Description: PGP signature

Re: linux-next: manual merge of the userns tree with the security tree

ser namespaces are not enabled what you wound up with should be fine. I will use your resolution today. Thanks. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpxdMrpivkuv.pgp Description: PGP signature

linux-next: build warning after merge of the vfs tree

ight to fdget"). perf_fget_light() takes the address of a struct fd * but does not do anything with it ... -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp7M4RYv6o6W.pgp Description: PGP signature

linux-next: manual merge of the net-next tree with the net tree

cally the same patch (for this file) except the net-next version adds two pr_err() calls. I used the net-next version and can carry the fix as necessary (no action is required). I do wonder if this change belongs in the net-next patch? -- Cheers, Stephen Rothwells...@canb.auug.o

linux-next: build failure after merge of the md tree

I have used the md tree from next-20120924 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp7fNOvyRu1C.pgp Description: PGP signature

linux-next: build failure after merge of the mfd tree

iver"). I have used the mfd tree from next-20120924 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpTlOrMtgejr.pgp Description: PGP signature

linux-next: build failure after merge of the pm tree

ed by commit e1f0b8e9b04a ("cpufreq: Remove support for hardware P-state chips from powernow-k8") but reintroduced (presumably incorrectly) by commit d20801be3c11 ("Merge branch 'master' into linux-next"). I have used the pm tree from next-20120924 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpe5cFN3xxZA.pgp Description: PGP signature

Re: linux-next: build failure after merge of the md tree

who needs it? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgphF4iMiXV2m.pgp Description: PGP signature

linux-next: manual merge of the workqueues tree with the thermal tree

() instead of cancel + queue") from the workqueues tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/thermal/thermal_sys.c index 4f77d89,67789b8..000 --- a/driv

linux-next: manual merge of the staging tree with the thermal tree

thermal: fix polling period settings") from the staging tree. I just used the thermal tree version and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpV1LJpWWdDt.pgp Description: PGP signature

linux-next: manual merge of the arm-soc tree with the tree

doc: Add device tree bindings for arch-vt8500 devices") from the arm-soc tree. I used the version from the arm-soc tree and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgplls4CcdlLM.pgp Description: PGP signature

linux-next: manual merge of the arm-soc tree with the fbdev tree

arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/video/msm/mdp_hw.h index 2a84137,a0bacf5..000 --- a/drivers/video/msm/mdp_hw.h +++ b/drivers/video/msm

linux-next: manual merge of the arm-soc tree with the sound tree

irqs.h removal") and 2203747c9771 ("ARM: omap: move platform_data definitions") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc sound/soc/omap/

linux-next: manual merge of the arm-soc tree with the sound tree

-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc sound/soc/omap/omap-pcm.c index a2636f6,b309941..000 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.

linux-next: manual merge of the arm-soc tree with the l2-mtd tree

MIO accessors") from the arm-soc tree. I just removed the files and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpmo37fS3KcY.pgp Description: PGP signature

linux-next: manual merge of the arm-soc tree with the usb tree

rk required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpilSpX8frr2.pgp Description: PGP signature

linux-next: Tree for Sept 25

or doing many randconfig builds. And to Paul Gortmaker for triage and bug fixes. 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 Rothwells...@canb.auug.org.au $ git checkout

Re: mmotm 2012-09-20-17-25 uploaded (fs/bimfmt_elf on uml)

Hi David, On Tue, 25 Sep 2012 12:43:53 -0700 (PDT) David Rientjes wrote: > > On Sat, 22 Sep 2012, Stephen Rothwell wrote: > > > > on uml for x86_64 defconfig: > > > > > > fs/binfmt_elf.c: In function 'fill_files_note': > > > fs/binfm

Re: [PATCH -next v2] Shorten constant names for EFI variable attributes

stants are used by > userspace programs. Why do this? It just looks like churn for no real gain. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpLkk55rSkYS.pgp Description: PGP signature

linux-next: manual merge of the net-next tree with Linus' tree

't break statements after assignment operator") from the net-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc net/batman-adv/bat_iv_ogm.c index 469daab,df79300..00

linux-next: manual merge of the wireless-next tree with the pci tree

;) from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/net/wireless/ath/ath9k/pci.c index c4f6980,c0c5996..000 --- a/drivers/net/wireless/ath/

linux-next: manual merge of the arm-soc tree with the fbdev tree

arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/video/msm/mdp_hw.h index 2a84137,a0bacf5..000 --- a/drivers/video/msm/mdp_hw.h +++ b/drivers/video/msm

linux-next: build failure after merge of the akpm tree

claration] net/core/dev.c: In function '__dev_set_promiscuity': net/core/dev.c:4573:5: error: implicit declaration of function 'audit_get_sessionid' [-Werror=implicit-function-declaration] Caused by commit "audit.h: replace defines with C stubs". I have rever

linux-next: build failure after merge of the v4l-dvb tree

used the v4l-dvb tree from next-20121026 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpppJycF84cE.pgp Description: PGP signature

linux-next: build failure after merge of the sound-asoc tree

adsp: Add ADSP base support"). Please build test this stuff - there is a typo in the Makefile. :-( I have used the sound-asoc tree from next-20121026 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpS4FUwIpbjX.pgp Description: PGP signature

linux-next: manual merge of the signal tree with the sparc tree

_execve()") from the signal tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/sparc/kernel/sys_sparc_64.c index 878ef3d,adfe60e..000 --- a/arch/sparc/kernel/sys_sp

linux-next: manual merge of the akpm-current tree with the staging tree

e akpm-current tree. The former removed the file modified by the latter, so I dropped the latter patch. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpxqEOQxsPS3.pgp Description: PGP signature

linux-next: Tree for Oct 29

ring stuff to do with linux-next at http://linux.f-seidel.de/linux-next/pmwiki/ . Thanks to Frank Seidel. -- Cheers, Stephen Rothwells...@canb.auug.org.au $ git checkout master $ git reset --hard stable Merging origin/master (8f0d816 Linux 3.7-rc3) Merging fixes/master (12250d8

Re: linux-next: build failure after merge of the sound-asoc tree

delay pushing it up to your linux-next included branch until after that is done. This case was particularly irritating because you were the developer of the patch that was broken which indicates that you are not even testing your own development work before pushing it out for others to work on

linux-next: manual merge of the samsung tree with the pinctrl tree

e for TMU driver for exynos4") from the samsung tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/arm/boot/dts/exynos4210.dtsi index d877dbe,038de97..000 --- a/arc

<    1   2   3   4   5   6   7   8   9   10   >