Re: [RESEND] Request f2fs filesystem inclusion in linux-next

Hi, On Mon, 26 Nov 2012 20:37:40 +0900 Jaegeuk Kim wrote: > > 2012-11-26 (월), 10:18 +1100, Stephen Rothwell: > > > > On Sat, 24 Nov 2012 14:28:45 +0900 Jaegeuk Kim > > wrote: > > > > > > About two month ago, I submitted a new file system, namely >

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

Hi Steve, On Mon, 26 Nov 2012 09:35:12 -0500 Steven Rostedt wrote: > > On Tue, 2012-11-27 at 00:49 +1100, Stephen Rothwell wrote: > > > > After merging the final tree, today's linux-next build (powerpc > > allyesconfig) failed like this: > > > > In

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

rom 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 drivers/net/ethernet/mellanox/mlx4/en_rx.c index 6fa106f,f76c967..000 --- a/drivers/net/ethernet/me

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 arch/arm/boot/dts/spear1340.dtsi index d487556,34da11a..000 --- a/arch/arm/boot/dts/spear1340.dts

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

pport") 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/spear13xx.dtsi index 701b0d7,009096d..000 --- a/arch/arm/boot/dts/spea

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

act flash controller") from the arm-soc tree. I have no idea how to fix this up, so I just effectively dropped the arm-doc tree patch. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp3Tb2LDgq9d.pgp Description: PGP signature

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

not required for ssp controller") 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-spear13xx/spear13xx.c index 0e166fa,c4af775..000 ---

linux-next: manual merge of the arm-soc tree with the battery 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/power/Kconfig index 263499f,b1d956d..000 --- a/drivers/power/Kconfig +++ b/drivers/power/Kconfig @@@ -346,6

linux-next: manual merge of the arm-soc tree with the usb 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/usb/host/ehci-orion.c index f74794c,e7e8275..000 --- a/drivers/usb/host/ehci-orion.c +++ b/drivers/usb/hos

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

CONFIG_EXPERIMENTAL") from the drop-experimental tree. I fixed it up (using the net-next version as that removed CONFIG_EXPERIMENTAL as well) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpkYtQXGi6rm.pgp Description: PGP signature

linux-next: Tree for Nov 27

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 (9489e9d Linux 3.7-rc7) Merging fixes/master

Re: linux-next: Tree for Nov 27 (file notify)

[Just adding some more cc's] On Tue, 27 Nov 2012 08:43:43 -0800 Randy Dunlap wrote: > > On 11/26/2012 10:25 PM, Stephen Rothwell wrote: > > > Hi all, > > > > Changes since 20121126: > > > > > when CONFIG_PROC_FS is not enabled (also seen in

linux-next: unusual update of the security tree

ed in Casey's tree after he merged in your tree from yesterday. Just for your consideration. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpg34bciC9ts.pgp Description: PGP signature

Re: linux-next: unusual update of the security tree

Hi James, On Wed, 28 Nov 2012 10:16:35 +1100 Stephen Rothwell wrote: > > The security tree > (git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next) > looks a bit strange today ... It appears to have been created by Casey > Schaufler (cc'd) and con

Re: linux-next: unusual update of the security tree

On Tue, 27 Nov 2012 15:30:31 -0800 Linus Torvalds wrote: > > On Tue, Nov 27, 2012 at 3:28 PM, Stephen Rothwell > wrote: > > > > If that is what happened, it may be worth always using the --no-ff flag > > to git merge/pull to make sure that the top commit on your tre

Re: linux-next: unusual update of the security tree

Hi Casey, On Tue, 27 Nov 2012 15:45:17 -0800 Casey Schaufler wrote: > > On 11/27/2012 3:16 PM, Stephen Rothwell wrote: > > > The security tree > > (git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git#next) > > looks a bit strange today ... It a

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

efined! Caused by commit 1cf3d8b3d24c ("powerpc+of: Add of node/property notification chain for adds and removes"). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpxQllmM276w.pgp Description: PGP signature

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

;) from the mfd tree. I fixed it up (using the version from the mfd tree) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpbe3PAO3IZK.pgp Description: PGP signature

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

Hi, On Tue, 27 Nov 2012 11:08:36 +0530 Viresh Kumar wrote: > > On 27 November 2012 10:14, Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in > > arch/arm/mach-spear13xx/spear1310.c between commit b47394911c26 ("ARM: > >

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

ndefined! Caused by commit 206c30cfeb7c ("PM / devfreq: Add suspend and resume apis"). I have used the pm tree from next-20121127 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp5TjT00uQya.pgp Description: PGP signature

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

remove TIOCGSOFTCAR and TIOCSSOFTCAR handling") from the staging tree. I fixed it up (using the staging tree version - since it is a superset of the tty tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.o

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

evice") from the clk tree. I fixed it up (I used the clk tree version since that removed the code that the arm-soc tree version modified) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpXimhBsoREF.pgp Description: PGP signature

linux-next: Tree for Nov 28

er 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/master

HOTPLUG replated patches

And they already have, and probably will, cause unnecessary conflicts between trees. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpI0HctgSMPN.pgp Description: PGP signature

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

;) from the rcu 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/x86/kernel/ptrace.c index 974b67e,65b88a5..000 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/

linux-next: build warning after merge of the xen-two tree

6/xen/enlighten.c:1617:11: warning: unused variable 'eax' [-Wunused-variable] Introduced by commit 9d02b43dee0d ("xen PVonHVM: use E820_Reserved area for shared_info"). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp0iNybDtx9Z.pgp Description: PGP signature

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

er-core 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/dw_dmac.c index 2c8096d,8f0b111..000 --- a/drivers/dma/dw_dmac.c +++ b/drivers/dma/dw_dmac.c @@@

linux-next: manual merge of the driver-core tree with the mfd 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/gpio/gpio-tps6586x.c index 62e9e1c,c1b82da..000 --- a/drivers/gpio/gpio-tps6586x.c +++ b/drivers/gpio/gpio-tp

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

the driver-core 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/mfd/ab8500-core.c index 3385db6,127b00a..000 --- a/drivers/mfd/ab8500-core.c +++ b/drivers/mfd

linux-next: manual merge of the driver-core tree with the mfd 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/mfd/da9052-core.c index 2153f9bb,689b747..000 --- a/drivers/mfd/da9052-core.c +++ b/drivers/mfd/da9052-core.c

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

6b52 ("mfd: remove use of __devinitconst") from the driver-core 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/mfd/sta2x11-mfd.c index 6fb0938,d6284ca..

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

t;mfd: remove use of __devexit") from the driver-core tree. I fixed it up (by using the mfd tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpRCrnfMjWM8.pgp Description: PGP signature

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

iver-core 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/pci/pci.h index 11a713b,e253881..000 --- a/drivers/pci/pci.h +++ b/drivers/pci/pci.h @@@ -159,12 -158,

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

river-core 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/pci/quirks.c index 0c59f7a,22ad3ee..000 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c @@@

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

er-core 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/power/ab8500_btemp.c index 8135542,989b099..000 --- a/drivers/power/ab8500_btemp.c +++ b/drivers/power/a

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

the driver-core 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/power/ab8500_charger.c index dddc947,7ecb8ab..000 --- a/drivers/power/ab8500_charger.c +++ b/drive

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

river-core 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/power/ab8500_fg.c index ed62ef7,331dc43..000 --- a/drivers/power/ab8500_fg.c +++ b/drivers/power

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

the driver-core 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/power/abx500_chargalg.c index dcdc439,19f2541..000 --- a/drivers/power/abx500_charg

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

__devinit") from the driver-core 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/power/da9052-battery.c index 3972dc0,bb0df89..000 --- a/drivers/power/da905

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

ot;) from the driver-core 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/power/max8925_power.c index b5a3ccb,1a075f1..000 --- a/drivers/power/max8925_po

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

core 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/Makefile index e91b9df,66787b9..000 --- a/lib/Makefile +++ b/lib/Makefile @@@ -12,7 -12,7 +12,7 @@@ lib-y := ct

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

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

linux-next: manual merge of the gpio tree with the driver-core 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/gpio/gpio-em.c index 320a718,b007063..000 --- a/drivers/gpio/gpio-em.c +++ b/drivers/gpio/gpio-em.c @@@ -234,41 -233,7

linux-next: manual merge of the arm-soc tree with the driver-core 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/leds/leds-ns2.c index bc6a0db,d64cc22..000 --- a/drivers/leds/leds-ns2.c +++ b/drivers/leds/leds-ns2.c @@@ -247,9 -

linux-next: manual merge of the pwm tree with the driver-core 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/pwm/pwm-tiecap.c index 87c091b,b4f9d47..000 --- a/drivers/pwm/pwm-tiecap.c +++ b/drivers/pwm/pwm-tiecap.c @@@ -184,7 -188,13

linux-next: manual merge of the pwm tree with the driver-core 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/pwm/pwm-tiehrpwm.c index 9ffd389,542d5f3..000 --- a/drivers/pwm/pwm-tiehrpwm.c +++ b/drivers/pwm/pwm-tiehrpwm.c @

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

I fixed it up (the latter removed the file) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpIxTvE5HK8s.pgp Description: PGP signature

linux-next: build warnings after merge of the slave-dma tree

;of: dma- fix build break for !CONFIG_OF"). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpdXBBk7Kbmn.pgp Description: PGP signature

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

_irq" redefined [enabled by default] include/linux/wait.h:621:0: note: this is the location of the previous definition Introduced by the interaction of commit c1fd29a11f43 ("drbd: Fix a race condition that can lead to a BUG()") from the block tree and commit "wait: add wai

linux-next: build warning after merge of the final tree (sound-asoc tree related)

; [-Wparentheses] Introduced by commit 973838a030d2 ("ASoC: wm_adsp: Enable DVFS for ADSP2"). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpHqZEeQOLDF.pgp Description: PGP signature

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

ial implementation of the various channel object classes") from the drm 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/nouveau/core/engine/disp/nv50.c

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

kvm 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/sched/core.c index 20fb760,c86b8b6..000 --- a/kernel/sched/core.c +++ b/kernel/sched/core.c @@@ -953,10

linux-next: manual merge of the arm-soc tree with the omap_dss2 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 arch/arm/mach-davinci/devices-da8xx.c index fcb30d3,46c9a0c..000 --- a/arch/arm/mach-davinci/devic

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

yscalls.h") 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/microblaze/include/asm/Kbuild index c5d7670,88a758a..000 --- a/arch/microblaze/incl

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

ecessarily" from the akpm tree. I fixed it up (using the version from the akpm tree) and can carry the fix as necessary (more action may be required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpdyuaEURnEI.pgp Description: PGP signature

Re: New MFD tree for linux-next

e 2 different branches of one > > tree, right (as can others)? > I understand that :) But using 2 trees rather than 2 separate branches is more > convenient to my personal workflow. No worries. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpEjSIpAxHYZ.pgp Description: PGP signature

Re: New MFD tree for linux-next

Hi Samuel, On Mon, 18 Mar 2013 01:11:02 +0100 Samuel Ortiz wrote: > > On Mon, Mar 18, 2013 at 10:45:20AM +1100, Stephen Rothwell wrote: > > On Mon, 18 Mar 2013 00:39:07 +0100 Samuel Ortiz > > wrote: > > > > > > > I assume that you are still using the f

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

ns") from the 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/trace/ftrace.c index ab25b88,2577082..000 --- a/kernel/trace/ftrace.c +++ b/kernel/trace

Re: [GIT PULL] Load keys from signed PE binaries

e that are still going forward? I ask because the pekey tree is interacting with other trees and it does not make sense to have those interactions in linux-next if the pekey work is never going upstream. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpEgsLtSzNcr.pgp Description: PGP signature

linux-next: build failure after merge of the char-misc tree

to undefined symbol '&softingcs_driver_init' drivers/net/can/softing/softing_cs.c:343:1: error: 'cleanup_module' aliased to undefined symbol '&softingcs_driver_exit' Caused by commit a750fa4edd9e ("softingcs: use module_pcmcia_driver"). I have

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

the AB8500 GPIO pins") 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/snowball.dts index d3ec32f,b095e85..000 --- a/arch/arm/boot/

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

2835 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/Kconfig index c63daef,0d3daa6..000 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -362,26 -362,17 +

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

from the bcm2835 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/Kconfig.debug index bce30a8,a877d51..000 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfi

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

to of_clk_get") from the tegra 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/clocksource/tegra20_timer.c index 2e4d8a6,bc4b8ad..000 --- a/drivers/clocksou

linux-next: Tree for Mar 18

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

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

e full-id case") from the l2-mtd 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/nand_ids.c index 9c61238,1c242cc..000 --- a/drivers/mtd/nand/nan

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

uot;) from the workqueues 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/workqueue.c index 55fac5b,833a152..000 --- a/kernel/workqueue.c +++ b/kernel/w

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

l_create() with NULL dev" 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 drivers/usb/gadget/amd5536udc.c index f52dcfe,142616a..000 --- a/drivers/usb/

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

e: implement and use pwq_adjust_max_active()"). This build does not have CONFIG_FREEZER set. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpWwKz3sEzs1.pgp Description: PGP signature

linux-next: Tree for Mar 19

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 origin/mast

Re: linux-next: Tree for Mar 19

Hi, On Tue, 19 Mar 2013 06:42:27 +0100 Sedat Dilek wrote: > > did forget to sent your email [1] to linux-next ML? No, and I even checked my mail server's logs and it was accepted by vger. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpkZ5mbFJclq.pgp Descr

Re: linux-next: Tree for Mar 19

Hi, On Tue, 19 Mar 2013 16:47:48 +1100 Stephen Rothwell wrote: > > On Tue, 19 Mar 2013 06:42:27 +0100 Sedat Dilek wrote: > > > > did forget to sent your email [1] to linux-next ML? > > No, and I even checked my mail server's logs and it was accepted by vger. Al

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

Hi Felipe, On Tue, 19 Mar 2013 08:33:34 +0200 Felipe Balbi wrote: > > On Tue, Mar 19, 2013 at 02:39:22PM +1100, Stephen Rothwell wrote: > > > > Today's linux-next merge of the akpm tree got a conflict in > > drivers/usb/gadget/amd5536udc.c between commit 6

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

Hi Tejun, On Tue, 19 Mar 2013 14:12:33 -0700 Tejun Heo wrote: > > On Tue, Mar 19, 2013 at 01:19:38PM +1100, Stephen Rothwell wrote: > > @@@ -456,40 -462,30 +462,30 @@@ static int worker_pool_assign_id(struc > > { > > int ret; > > > > - mutex_lock(

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

Hi Tejun, On Tue, 19 Mar 2013 15:13:08 -0700 Tejun Heo wrote: > > On Wed, Mar 20, 2013 at 09:05:40AM +1100, Stephen Rothwell wrote: > > > Anyways, I pulled master into wq/for-next and resolved it there, so it > > > shouldn't cause you any more trouble. > > &g

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

ivers/usb/serial/quatech2.c:705:15: error: 'struct qt2_port_private' has no member named 'is_open' Caused by commit e4408ce3c23f ("TTY: quatech2, remove unneeded is_open"). grep is your friend (or searching while editting the file). I have used the tty tree

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

Buffer Driver" 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 include/linux/hyperv.h index 95d0850,a460ee4..000 --- a/include/linux/hyperv.h +++

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

Hi all, On Wed, 13 Mar 2013 14:33:15 +0800 Li Zefan wrote: > > On 2013/3/13 13:12, Stephen Rothwell wrote: > > > > After merging the final tree, today's linux-next build (powerpc > > allnoconfig) failed like this: > > > > In file incl

linux-next: Tree for Mar 20

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 (10b386

Re: linux-next: Tree for Mar 20

robably postmas...@vger.kernel.org (cc'd). I am not sure why you have a problem, again the mailing list copy of the announcement was in my inbox 10 seconds after I posted it. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp5EwwCJGnfB.pgp Description: PGP signature

Re: linux-next: build failure after merge of the final tree (gpio tree relatred)

Hi Grant, On Wed, 6 Mar 2013 09:10:42 +0800 Grant Likely wrote: > > On Wed, Mar 6, 2013 at 8:44 AM, Stephen Rothwell > wrote: > > > > After merging the final tree, today's linux-next build (powerpc > > allyesconfig) failed like this: > > >

Re: linux-next: build failure after merge of the final tree (gpio tree relatred)

Hi Grant, On Wed, 20 Mar 2013 15:57:01 + Grant Likely wrote: > > On Wed, Mar 20, 2013 at 3:25 PM, Stephen Rothwell > wrote: > > > > On Wed, 6 Mar 2013 09:10:42 +0800 Grant Likely > > wrote: > >> > >> On Wed, Mar 6, 2013 at 8:44 AM, Stephen R

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

Hi Tejun, On Wed, 20 Mar 2013 07:51:35 -0700 Tejun Heo wrote: > > On Wed, Mar 20, 2013 at 03:43:28PM +1100, Stephen Rothwell wrote: > > It has returned today. Please be more careful. > > > > In file included from include/linux/memcontrol.h:22:0, > >

Re: [GIT PULL] Load keys from signed PE binaries

Hi David, On Wed, 20 Mar 2013 16:52:39 + David Howells wrote: > > David Howells wrote: > > > Stephen Rothwell wrote: > > > > > David, if I do remove it, are there other patches in your pekey tree that > > > are still going forward? > > > &

Re: New tree for linux-next

y unit tested, and * destined for the current or next Linux merge window. Basically, this should be just what you would send to Linus (or ask him to fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participating in li

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

F2_DMA_CONTIG should depend on HAS_DMA") 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 drivers/media/platform/Kconfig index a0639e7,42c62aa..00

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

note: each undeclared identifier is reported only once for each function it appears in Caused by commit 6f384ccffdf0 ("ASoC: arizona: Log thermal events"). I have used the sound-asoc tree from next-20130320 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpvyDXYNhbYt.pgp Description: PGP signature

Re: linux-next: Tree for Mar 20 (vmcore)

t; How can this be protected by CONFIG_KEXEC? > > These patches were removed from -mm today so it should no longer be a > problem. What exactly are "these patches" so that I can remove them from my copy of the mmotm tree (assuming that Andrew does not get a new mmotm release

Re: linux-next: Tree for Mar 20 (vmcore)

Hi David, On Wed, 20 Mar 2013 19:49:09 -0700 (PDT) David Rientjes wrote: > > On Thu, 21 Mar 2013, Stephen Rothwell wrote: > > > What exactly are "these patches" so that I can remove them from my copy > > of the mmotm tree (assuming that Andrew does not get a new

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

Hi Greg, On Wed, 20 Mar 2013 14:12:11 +1100 Stephen Rothwell wrote: > > After merging the tty tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/net/caif/caif_serial.c: In function 'update_tty_status': > drivers/net/caif/ca

linux-next: manual merge of the usb tree with the usb.current tree

m the usb tree. I assume that the latter fixed the problem fixed by the former, so just used the latter and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpedGyE1FJsP.pgp Description: PGP signature

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

pages" 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 arch/sparc/mm/init_64.c index 076068f,3f559d1..000 --- a/arch/sparc/mm/init_64.c +++

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

ot enabled" was included in the commit log so that we could figure out exactly what needed to be protected instead of just effectively removing the whole file. I just reverted that commit for today. Can someone please supply a better solution or even just more information about what

linux-next: Tree for Mar 21

fig 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 reset --har

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

t;) from the security 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/digsig.c index dc2be7e,0103c5b..000 --- a/lib/digsig.c +++ b/lib/digsig.c @@@ -162,13

linux-next: build failure after merge of the xen-two tree

e()") from the tip tree. The automatic merge left the moved version of the above line intact while it should have been removed (I assume). I have added the following merge fix patch and can carry the fix as necessary. From: Stephen Rothwell Date: Mon, 4 Feb 2013 15:08:33 +1100 Subject

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

CONFIG_EXPERIMENTAL") from the driver-core tree. The former removed the file, so I did that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp6D0HTcU4jK.pgp Description: PGP signature

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

CONFIG_EXPERIMENTAL") from the driver-core tree. The former removed part of the text changed by the latter, so I just did that (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/net/

linux-next: manual merge of the char-misc tree with the mfd tree

om the char-misc 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/mfd/wm5102-tables.c index c68727d,a396a3a..000 --- a/drivers/mfd/wm5102-tables.c +++ b/dr

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

detection") from the pinctrl tree. I fixed it up (the former is a subset of the latter) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpuUQmeO0gUY.pgp Description: PGP signature

  1   2   3   4   5   6   7   8   9   10   >