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

2012-10-29 Thread Stephen Rothwell
tation for Versatile Express") from the clk 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/include/asm/hardware/sp810.h index 2cdcf44,afd7e91..000 -

linux-next: Tree for Oct 30

2012-10-29 Thread Stephen Rothwell
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 master $ git reset --hard stable Merging origin

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

2012-10-30 Thread Stephen Rothwell
(by using the block tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpXsDiI9GJwZ.pgp Description: PGP signature

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

2012-10-30 Thread Stephen Rothwell
ach-omap2") 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-omap2/drm.c index 49a7ffb,6282cc8..000 --- a/arch/arm/mach-omap2/drm.c

linux-next: Tree for Oct 31

2012-10-30 Thread Stephen Rothwell
out 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/ . Thanks t

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

2013-08-26 Thread Stephen Rothwell
^ Caused by commit 2e569fefc95a ("f2fs: fix omitting to update inode page"). Not even build tested :-( I have used the f2fs tree from next-20130822 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpKSqyNCSDhD.pgp Description: PGP signature

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

2013-08-26 Thread Stephen Rothwell
m next-20130822 for today. P.S. drivers/ata/libata.h seems to assume that a lot of other stuff is included that it does not include explicitly ... -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp6L9rhwHiZ7.pgp Description: PGP signature

linux-next: manual merge of the pm tree with the powerpc tree

2013-08-26 Thread Stephen Rothwell
Rafael, I used both your addresses because I have had a bounce from the sisk.pl one in the past ... -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpgfGTPaP0mK.pgp Description: PGP signature

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

2013-08-26 Thread Stephen Rothwell
") 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/mac80211/ibss.c index 2d45643,e08387c..000 --- a/net/mac80211/ibss.c +++ b/net/mac80211/ibss.c

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

2013-08-26 Thread Stephen Rothwell
") from the wireless-next 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 net/mac80211/ibss.c index cb73baf,74de0f1..000 --- a/net/mac80211/ibss.c

Re: [guv 00/16] [RFC] percpu: Replace __get_cpu_var uses throughout the kernel

2013-08-26 Thread Stephen Rothwell
an pretty much guarantee that new usages will be added between the generation of the patch set and their integration. Its also helpful (to me, at least) if these can be routed via various subsystem trees to lower the number of conflicts ... -- Cheers, Stephen Rothwells...@canb.au

linux-next: manual merge of the regulator tree with the pm tree

2013-08-26 Thread Stephen Rothwell
gulator_get_optional()") from the regulator 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/cpufreq/cpufreq-cpu0.c index bad620e,e9dedb2..000 --- a/drive

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

2013-08-26 Thread Stephen Rothwell
LE_DEVICE_TABLE' MODULE_DEVICE_TABLE(of, dra7xxx_qspi_match); ^ Caused by commit 505a14954e2d ("spi/qspi: Add qspi flash controller"). Clearly not build tested as a module. :-( I have used the spi tree from next-20130822 for today. -- Cheers, Stephen Rothwell

linux-next: manual merge of the scsi tree with the infiniband tree

2013-08-27 Thread Stephen Rothwell
very support") from the scsi 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/infiniband/ulp/iser/iser_initiator.c index bdc38f4,b31fa1d..000 --- a

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

2013-08-27 Thread Stephen Rothwell
nodes") from the arm-soc tree. I fixed it up (probably incorrectly - 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/am335x-bone.dts index a8907b5,d99be03..000 --- a/arc

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

2013-08-27 Thread Stephen Rothwell
550aa0 ("ARM: dts: AM33XX: don't redefine OCP bus and device nodes") from the arm-soc tree. I fixed it up (probably incorrectly - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --c

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

2013-08-27 Thread Stephen Rothwell
vice nodes") from the arm-soc tree. I fixed it up (probably incorrectly - 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/am335x-evmsk.dts index e92446c,8e7279b..000

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

2013-08-27 Thread Stephen Rothwell
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/omap5.dtsi index 07be2cd,4fc0912..000 --- a/arch/arm/boot/dts/omap5.dtsi +++ b/arch/arm/boot/dts/oma

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

2013-08-27 Thread Stephen Rothwell
le more places") 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/boot/dts/tegra20-seaboard.dts index c824253,f44a9b8..000 --- a/arch/arm

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

2013-08-27 Thread Stephen Rothwell
le more places") 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/boot/dts/tegra20-trimslice.dts index 1e9d33a,22e227f..000 --- a/arch/arm/

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

2013-08-27 Thread Stephen Rothwell
llocation") 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-mvebu/platsmp.c index 594b63d,4f960f0..000 --- a/arch/arm/mach-mvebu/plat

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

2013-08-27 Thread Stephen Rothwell
om Linus' tree and commit 819c1de344c5 ("clk: add CLK_SET_RATE_NO_REPARENT flag") from the clk tree. I fixed it up (see below and in a couple of places I chose CLK_SET_RATE_NO_REPARENT over CLK_SET_RATE_PARENT, which may, of course, be wrong) and can carry the fix as necessary (no action is

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

2013-08-27 Thread Stephen Rothwell
nabled by default] kernel/cgroup.c:237:36: note: expected 'struct cgroup_subsys *' but argument is of type 'int' Introduced by commit ca8bdcaff0d7 ("cgroup: make cgroup_css() take cgroup_subsys * instead and allow NULL subsys"). -- Cheers, Stephen Rothwell

linux-next: Tree for Aug 27

2013-08-27 Thread Stephen Rothwell
/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/ . Thanks to Frank Seidel.

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

2013-08-27 Thread Stephen Rothwell
Hi all, On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette wrote: > > Quoting Sören Brinkmann (2013-08-27 08:44:11) > > On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote: > > > On 27/08/13 10:03, Stephen Rothwell wrote: > > > > Hi Mike, > > >

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

2013-08-27 Thread Stephen Rothwell
Hi Stephen, On Tue, 27 Aug 2013 10:17:21 -0600 Stephen Warren wrote: > > On 08/27/2013 02:29 AM, Stephen Rothwell wrote: > > > > Today's linux-next merge of the arm-soc tree got a conflict in > > arch/arm/boot/dts/tegra20-trimslice.dts between commit > >

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

2013-08-27 Thread Stephen Rothwell
lementation of raid6") from the md 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 lib/raid6/Makefile index b462578,e5e9021..000 --- a/lib/raid6/Makefile +++ b/lib/rai

linux-next: status of the memblock tree

2013-08-27 Thread Stephen Rothwell
Hi Tejun, I was wondering if the memblock tree needs to exist any more. The last commit to it was in December 2011 and was merged into Linus' tree during the v3.3 merge window. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgprPfJ2ZgTDZ.pgp Description: PGP signature

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

2013-08-27 Thread Stephen Rothwell
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/boot/dts/am335x-bone.dts index d318987,d99be03..000 --- a/arch/arm/boot/dts/am335x-bone.dts +++ b/arch/arm

linux-next: manual merge of the dma-mapping tree with the driver-core tree

2013-08-28 Thread Stephen Rothwell
lean source code and prepare for device tree") from the dma-mapping tree. I fixed it up (the latter is a superset of the former, so I used that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpcDpk6xwpX0.pgp Description: PGP signature

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

2013-08-28 Thread Stephen Rothwell
Hi all, On Wed, 28 Aug 2013 10:04:31 +1000 Stephen Rothwell wrote: > > On Tue, 27 Aug 2013 09:53:19 -0700 Mike Turquette > wrote: > > > > Quoting Sören Brinkmann (2013-08-27 08:44:11) > > > On Tue, Aug 27, 2013 at 11:09:52AM +0100, James Hogan wrote: >

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

2013-08-28 Thread Stephen Rothwell
t;), 98c53a09f937 ("pidns: kill the unnecessary CLONE_NEWPID in copy_process()") and ddb3b016a3f7 ("fork: unify and tighten up CLONE_NEWUSER/CLONE_NEWPID checks") from the akpm-current tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). --

linux-next: Tree for Aug 28

2013-08-28 Thread Stephen Rothwell
rtmaker 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 master $ git reset --hard stable Merging origin/mas

Re: linux-next: status of the memblock tree

2013-08-28 Thread Stephen Rothwell
Hi Tejun, On Wed, 28 Aug 2013 08:28:09 -0400 Tejun Heo wrote: > > On Wed, Aug 28, 2013 at 04:34:59PM +1000, Stephen Rothwell wrote: > > I was wondering if the memblock tree needs to exist any more. The last > > commit to it was in December 2011 and was merged into Linus&#x

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

2013-08-28 Thread Stephen Rothwell
VIN and ML86V7667 support") from the v4l-dvb 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/board-bockw.c index 3354a85,7d44f66..000 --- a/arch/a

linux-next: manual merge of the drm-intel tree with the drm tree

2013-08-28 Thread Stephen Rothwell
drm-intel 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/gpu/drm/drm_crtc.c index 54b4169,190827d..000 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/d

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

2013-08-29 Thread Stephen Rothwell
ot;) from the pinctrl 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/pinctrl/pinctrl-sunxi.c index 94716c7,8dbd465..000 --- a/drivers/pinctrl/pinctrl-sunxi.c

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

2013-08-29 Thread Stephen Rothwell
anup registration of mmcif") 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/board-bockw.c index 35dd7f2,255e97e..000 --- a/arc

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

2013-08-29 Thread Stephen Rothwell
Marzen use of ") and fee529df76ff ("ARM: shmobile: r8a7779: cleanup registration of usb phy") 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 ar

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

2013-08-29 Thread Stephen Rothwell
kw: add DT reference"), a66c9744574c ("ARM: shmobile: r8a7778: cleanup registration of mmcif") and 044e2121466a ("ARM: shmobile: r8a7778: cleanup registration of usb phy") from the arm-soc tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). --

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

2013-08-29 Thread Stephen Rothwell
registration of usb phy") 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/r8a7779.h index 6d2b641,f08d6ec..00

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

2013-08-29 Thread Stephen Rothwell
e") and a66c9744574c ("ARM: shmobile: r8a7778: cleanup registration of mmcif") 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/

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

2013-08-29 Thread Stephen Rothwell
istration of usb phy") 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/setup-r8a7779.c index 3d89288,6a99333..000 --- a/arc

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

2013-08-29 Thread Stephen Rothwell
ot;) from the pm tree and commit 14d2c34cfa00 ("cpuidle: big.LITTLE: vexpress-TC2 CPU idle driver") 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 renesas tree with the v4l-dvb tree

2013-08-29 Thread Stephen Rothwell
: Select DRM_RCAR_DU in defconfig") from the renesas 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/configs/marzen_defconfig index 000e920,26f30be..0

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

2013-08-29 Thread Stephen Rothwell
Hi Andrew, I have dropped the patch "revert "SELinux: do not handle seclabel as a special flag"" from the akpm tree as the patch that it reverted was dropped form the selinux tree (along with everything else in that tree). -- Cheers, Stephen Rothwells

linux-next: build warnings after merge of the akpm-current tree

2013-08-29 Thread Stephen Rothwell
d here Possibly introduced by commit 34c547af1e23 ("mm/page-writeback.c: add strictlimit feature"), but I am not sure anything can be done about them. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpp9UlnykzcW.pgp Description: PGP signature

linux-next: Tree for Aug 29

2013-08-29 Thread Stephen Rothwell
e 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 Rothwe

Re: linux-next: manual merge of the vhost tree with the target-updates tree

2013-07-08 Thread Stephen Rothwell
Hi Nicholas, On Mon, 08 Jul 2013 18:13:26 -0700 "Nicholas A. Bellinger" wrote: > > On Mon, 2013-07-08 at 13:47 +1000, Stephen Rothwell wrote: > > > > Today's linux-next merge of the vhost tree got a conflict in > > drivers/vhost/scsi.c between commi

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

2013-07-08 Thread Stephen Rothwell
m the tip 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/irq/generic-chip.c index 10e663a,2f274f3..000 --- a/kernel/irq/generic-chip.c +++ b/kernel/irq/gen

linux-next: Tree for Jul 9

2013-07-09 Thread Stephen Rothwell
ive 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/pmwik

Re: linux-next: build failure after merge of the final tree (v4l-dvb tree related)

2013-07-09 Thread Stephen Rothwell
Hi Mauro, On Mon, 8 Jul 2013 09:58:19 -0300 (BRT) Mauro Carvalho Chehab wrote: > > I'll wait for tomorrow's next to see if everything is ok, before sending a > new pull request. Looks good today. -- Cheers, Stephen Rothwells...@canb.auug.org.au

Re: linux-next: reminder

2013-07-09 Thread Stephen Rothwell
Hi all, On Tue, 2 Jul 2013 17:09:57 +1000 Stephen Rothwell wrote: > > We are in the merge window, so please do not add anything to your > linux-next included branches that is not destined for v3.11 until after > v3.11-rc1 is released. No, really :-( i.e. maintainers should be sa

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

2013-07-09 Thread Stephen Rothwell
e for today - please clean up. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgphNOCO6cG7n.pgp Description: PGP signature

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

2013-07-09 Thread Stephen Rothwell
for today. And, yes, I am a little annoyed by this. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpAAqmQiDVLL.pgp Description: PGP signature

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

2013-07-09 Thread Stephen Rothwell
ftrace 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/panic.c index 9771231,4cea6cc..000 --- a/kernel/panic.c +++ b/kernel/panic.c @@@ -399,9 -400,10 +400,11

linux-next: Tree for Jul 10

2013-07-09 Thread Stephen Rothwell
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 (2e17c5a Merge branch 'drm-next' of git:/

Re: [uclinux-dist-devel] [GIT PULL] Blackfin updates for 3.11

2013-07-09 Thread Stephen Rothwell
rnel/git/realmz6/blackfin-linux.git That tree only has for-linus and master branches. linux-next uses the blackfin-linus branch of your github tree ... so what should I use now? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpjX3p5gL3gM.pgp Description: PGP signature

Re: [uclinux-dist-devel] [GIT PULL] Blackfin updates for 3.11

2013-07-10 Thread Stephen Rothwell
Hi Steven, On Wed, 10 Jul 2013 14:05:45 +0800 Steven Miao wrote: > > Pls use for-linus branch on > http://git.kernel.org/pub/scm/linux/kernel/git/realmz6/blackfin-linux.git Done. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpa2k9AByyhk.pgp Descrip

linux-next: rebase of lblnet tree

2013-07-10 Thread Stephen Rothwell
or rebased after the merge window opened), so why move it again? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpMbk87TFLip.pgp Description: PGP signature

linux-next: rebase of the drivers-x86 tree

2013-07-10 Thread Stephen Rothwell
. released or rebased after the merge window opened), so why move it again? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpxPeeznXyk_.pgp Description: PGP signature

linux-next: rebase/rewrite of the renesas tree

2013-07-10 Thread Stephen Rothwell
for v3.11 now anyway). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp1dJmZzxtkw.pgp Description: PGP signature

linux-next: rebase of the jdelvare-hwmon quilt series

2013-07-10 Thread Stephen Rothwell
. released or rebased after the merge window opened), so why move it again? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpBAR9uNGOG_.pgp Description: PGP signature

linux-next: rebase of the device-mapper quilt series

2013-07-10 Thread Stephen Rothwell
. released or rebased after the merge window opened), so why move it again? -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpZU4xOA7SzK.pgp Description: PGP signature

Re: linux-next: rebase/rewrite of the renesas tree

2013-07-10 Thread Stephen Rothwell
fast forwarding into the arm soc tree after the spot where your stuff was merged). You should also not rebase them if others are using them as a base for development. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpUmOsJ9BXHX.pgp Description: PGP signature

linux-next: Tree for Jul 11

2013-07-10 Thread Stephen Rothwell
andconfig 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 master $ git r

Re: [git pull] device-mapper changes for 3.11

2013-07-10 Thread Stephen Rothwell
nus your pre merged branch and if there is some complex conflict, then explain it to him (and me if necessary) or publish your test branch separately to show your suggested resolution. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpR2XqKiVJ0F.pgp Description: PGP signature

Re: linux-next: rebase of the jdelvare-hwmon quilt series

2013-07-10 Thread Stephen Rothwell
Hi Jean, On Thu, 11 Jul 2013 07:57:00 +0200 Jean Delvare wrote: > > On Thu, 11 Jul 2013 10:27:24 +1000, Stephen Rothwell wrote: > > Why have you just rebased the jdelvare-hwmon series > > (http://khali.linux-fr.org/devel/linux-3/jdelvare-hwmon/)? You have > > just inva

Re: linux-next: rebase of the jdelvare-hwmon quilt series

2013-07-11 Thread Stephen Rothwell
n add that message to the top of my daily release announcements (though I forgot during this merge window). This restriction is imposed so that maintainers still getting their code into the current merge window are not distracted by reports of problems in linux-next to do with code that will not be merge

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

2013-07-11 Thread Stephen Rothwell
10 Assabet") from the arm-current 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/mm/init.c index 6833cbe,0ecc43f..000 --- a/arch/arm/mm/init.c +++ b/arch/a

Re: linux-next: rebase of the jdelvare-hwmon quilt series

2013-07-11 Thread Stephen Rothwell
On Fri, 12 Jul 2013 10:27:59 +1000 Stephen Rothwell wrote: > > As Paul said, new material should not enter linux-next until after -rc1 > is released. In fact, every time Linus opens a merge window, I send an > email to lkml and the linux-next list saying just that. I also ofte

Re: [git pull] device-mapper changes for 3.11

2013-07-11 Thread Stephen Rothwell
think he is pretty good about that). > There will be a learning curve for me initially on how to interface with > linux-next, proper git rebase protocol relative to Linus' ideals, etc > but I hope to cut through that quickly. Excellent. Please feel free to ask if you have any questions.

Re: [dm-devel] [git pull] device-mapper changes for 3.11

2013-07-11 Thread Stephen Rothwell
Hi Alasdair, On Thu, 11 Jul 2013 14:55:22 +0100 Alasdair G Kergon wrote: > > On Thu, Jul 11, 2013 at 04:20:40PM +1000, Stephen Rothwell wrote: > > Alistair, is there some reason that you cannot maintain some relatively > > stable git tree for me to fetch (instead o

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

2013-07-11 Thread Stephen Rothwell
(see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/xfs/xfs_qm.h index 579d6a0,cf2ad1f..000 --- a/fs/xfs/xfs_qm.h +++ b/fs/xfs/xfs_qm.h @@@ -44,14 -44,10 +44,12 @@@ extern struct kmem_zone

linux-next: Tree for Jul 12

2013-07-11 Thread Stephen Rothwell
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 Rothwell

Re: [GIT PULL REQUEST] watchdog - v3.11-rc1

2013-07-11 Thread Stephen Rothwell
Also, you might like to consider using "git request-pull" to generate a starting place for your pull request rather than sending all the commit messages and the diff in line. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpSalTUnt4jX.pgp Description: PGP signature

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

2013-09-15 Thread Stephen Rothwell
from the h8300-remove tree. I just removed the file and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpwhfBCrd94Y.pgp Description: PGP signature

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

2013-09-15 Thread Stephen Rothwell
d support for read_iter, write_iter") from the aio-direct 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/block_dev.c index 1e86823,89d8ec5..000 --- a/fs/bloc

linux-next: Tree for Sep 16

2013-09-15 Thread Stephen Rothwell
el.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 (d8efd82 Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus) Mergin

Re: Why does test_bit() take a volatile addr?

2013-09-15 Thread Stephen Rothwell
a volatile to a non volatile (I think). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpqU5XUhp_0a.pgp Description: PGP signature

Re: Why does test_bit() take a volatile addr?

2013-09-16 Thread Stephen Rothwell
Hi Michael, On Mon, 16 Sep 2013 10:26:03 +0300 "Michael S. Tsirkin" wrote: > > On Mon, Sep 16, 2013 at 04:53:44PM +1000, Stephen Rothwell wrote: > > > > On Mon, 16 Sep 2013 13:38:35 +0930 Rusty Russell > > wrote: > > > > > > Predates git,

linux-next: Tree for Sep 17

2013-09-16 Thread Stephen Rothwell
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 origin/master (272b98c Linux 3.12-rc1) Merging fixes/master

Re: Please add PTR_RET tree.

2013-09-16 Thread Stephen Rothwell
Hi Rusty, On Tue, 17 Sep 2013 10:20:55 +0930 Rusty Russell wrote: > > Please remove PTR_RET tree, it's merged. OK, thanks for letting me know. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpVBmDb4Fm5L.pgp Description: PGP signature

linux-next stats (Was: Linux 3.12-rc1)

2013-09-16 Thread Stephen Rothwell
rew's patches are fixes for other patches in his tree (and have been merged into those). Top ten commiters: 116 Stephen Rothwell 33 Dave Kleikamp 31 Daniel Vetter 28 Benoit Cousson 26 Eric Paris 22 Jason Cooper 14 Joern Engel 11 Shawn Guo 1

linux-next: old trees

2013-09-17 Thread Stephen Rothwell
s ago tmem11 months ago uclinux 7 months ago unicore32 10 months ago uprobes 1 year, 6 months ago viafb 1 year, 6 months ago -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpJBocrZ7HZw.pgp Description: PGP signature

Re: linux-next: old trees

2013-09-17 Thread Stephen Rothwell
em for Ben to bring in via his tree. The arch isn't > dead, but it's certainly not going to have much in the way of new > changes. The overall powerpc tree is probably sufficient for > linux-next. Removed. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgps75UbSiVVz.pgp Description: PGP signature

Re: linux-next: old trees

2013-09-17 Thread Stephen Rothwell
Hi Sekhar, On Tue, 17 Sep 2013 16:44:32 +0530 Sekhar Nori wrote: > > You can remove the davinci tree from linux-next since the patches are > now reaching linux-next through ARM-SoC tree. Apologies for not asking > you to remove it for so long. Done. -- Cheers, Step

Re: linux-next stats (Was: Linux 3.12-rc1)

2013-09-17 Thread Stephen Rothwell
Hi Nicholas, On Tue, 17 Sep 2013 17:23:41 -0700 "Nicholas A. Bellinger" wrote: > > On Tue, 2013-09-17 at 15:50 +1000, Stephen Rothwell wrote: > > On Mon, 16 Sep 2013 18:08:11 -0400 Linus Torvalds > > wrote: > > > > > > So it's been two

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

2013-09-17 Thread Stephen Rothwell
wap") from the aio-direct tree and commit c18d1ec44f7a ("nfs: use %p[dD] instead of open-coded (and often racy) equivalents") from the vfs tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells..

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

2013-09-17 Thread Stephen Rothwell
e_vma") from the drm-intel 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/gpu/drm/i915/i915_gem.c index df9253d,d00d24f..000 --- a/drivers/gpu/drm/i915/i91

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

2013-09-17 Thread Stephen Rothwell
d state readout and checking for has_dp_encoder and dp_m_n") from the drm-intel 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/gpu/drm/i915/intel_drv.h ind

Re: [GIT PULL] Keyrings patches

2013-09-17 Thread Stephen Rothwell
there some reason that those fixups cannot be done in a merge commit? i.e. are they more than simple text updates? /me thinks that most rebases people do can be better done (and documented) as merges. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpFPMoSTFTzZ.pgp

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

2013-09-17 Thread Stephen Rothwell
pio user handler iff gpio_to_irq is done"). set_irq_flags() only exists on arm (and arm64). I have used the gpio tree from next-20130917 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpg9GKKdBDoM.pgp Description: PGP signature

linux-next: Tree for Sep 18

2013-09-17 Thread Stephen Rothwell
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 (de0bc3d Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile) Me

linux-next: Tree for Sep 19

2013-09-18 Thread Stephen Rothwell
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 origin/master (9baa50

linux-next: manual merge of the drm-intel tree with the drm-intel-fixes tree

2013-09-19 Thread Stephen Rothwell
LL for DSI") from the drm-intel 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/gpu/drm/i915/intel_display.c index d8a1d98,2ed974e..000 --- a/drivers/gpu/

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

2013-09-19 Thread Stephen Rothwell
IN control driver for the GPIO controller on bf54x and bf60x"). asm/portmux.h only exists on blackfin ... I have used the version of the pinctrl tree from next-20130919 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpzwUVdB31w_.pgp Description: PGP signature

linux-next: Tree for Sep 20

2013-09-19 Thread Stephen Rothwell
. 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 Rothwells...@canb.

linux-next: taking a break

2013-09-19 Thread Stephen Rothwell
a release ... Please plan accordingly. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpqGN1haVK2a.pgp Description: PGP signature

linux-next: Tree for Sep 4

2013-09-04 Thread Stephen Rothwell
idel.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 (a923874 Merge tag 'pci-v3.12-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helga

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