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

1da0e ("irqchip: s3c24xx: add devicetree support") 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 drivers/irqchip/irq-s3c24xx.c index 8296d94,5e40b

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

is not defined [-Wundef] drivers/net/wireless/rtlwifi/rtl8188ee/trx.h:577:5: warning: "__LITTLE_ENDIAN" is not defined [-Wundef] -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp9TZsCkRTrx.pgp Description: PGP signature

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

Hi Michal, On Fri, 5 Apr 2013 07:52:34 +0200 Michal Simek wrote: > > 2013/4/5 Stephen Rothwell > > > > BTW, that xilinx tree commit has no "Signed-off-by" for the committer ... > > Interesting that you can't see Rob's Signed-off-by line. Rob was t

linux-next: Tree for Apr 5

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 Me

Re: [PATCH v3 00/44] Meta Linux Kernel Port

to > that > effect. Linus prefers to not pull from github, but will if you ask him to pull a tag signed with a verifiable gpg key. This is not a requirement if your tree is on kernel.org (though you still need a verifiable gpg key to get a kernel.org account). -- Cheers, Stephen Rothwell

Re: [PATCH v3 00/44] Meta Linux Kernel Port

Hi Vineet, On Wed, 30 Jan 2013 07:44:52 +1100 Stephen Rothwell wrote: > > On Mon, 28 Jan 2013 12:40:24 +0530 Vineet Gupta > wrote: > > > > Stephen, can you please add the following branch (rebased off 3.8-rc5) to > > linux-next > > > > git://github.c

Re: linux-next: new arch/metag tree

* 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 linux-next,

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

andler") from the 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 drivers/acpi/internal.h index 0f24148,0d1397d..000 --- a/drivers/acpi/internal.h +++ b/drivers/

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

dd support for pl320 IPC"). I have used the pm tree from next-20130128 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpnCDPpKhWM8.pgp Description: PGP signature

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

C irq for instant current") 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/abx500/ab8500-bm.h index 9bd037d,e2a1e6d..000 --- a/i

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

ithout a cast [enabled by default] arch/x86/include/asm/page_64.h:12:29: note: expected 'long unsigned int' but argument is of type 'void *' Introduced by commit a25b9316841c ("x86, mm: Make DEBUG_VIRTUAL work earlier in boot"). -- Cheers, Stephen Rothwell

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

e") 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/pinctrl/pinctrl-nomadik.c index 39c1651,ef21a66..000 --- a/drivers/pinctrl/pinctrl-nomadi

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

from the arm-soc tree and commit bda7f6d4e198 ("gpio: samsung: skip gpiolib registration if pinctrl support is enabled for exynos5250") from the samsung tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell

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

ation for exynos5250 if pinctrl is enabled") 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/mach-exynos/common.c index 68c0689,cdaa55f..00

linux-next: no tree for Jan 30

Hi all, There will be no tree for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpHOXnwlnknU.pgp Description: PGP signature

Re: Linux-Next releases this week?

linux.conf.au." Turns out that the conference was a bit more tiring than I thought even though it was in my home town :-) > Interesting stuff around for-3.9 :-). Yes. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpE6syTF3Gsa.pgp Description: PGP signature

Re: linux-net for ARC port

the next few days as I attend linux.conf.au." Turns out that the conference was a bit more tiring than I thought even though it was in my home town :-) So now it will probably not be until Monday my time, sorry. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpQOo9

Re: linux-net for ARC port

Hi Geert, On Fri, 1 Feb 2013 13:33:13 +0100 Geert Uytterhoeven wrote: > > You're not flying into FOSDEM, tomorrow? Not unless you are paying :-) /me starts packing in anticipation ;-) -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpgrHSY79t6m.pgp Descr

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

lue] Caused by commit aab982cb5dfb ("SUNRPC: remove cache_detail->cache_upcall callback"). Also, why don't those statements end in semicolons? I have used the nsfd tree from next-20130128 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpyhH42jfvim.pgp Description: PGP signature

linux-next: manual merge of the net-next tree with the net 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/vmxnet3/vmxnet3_drv.c index 12c6440,b1c90f8..000 --- a/drivers/net/vmxnet3/vmxnet3_drv.c

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

) from the net-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/ipv6/route.c index 363d8b7,f3328bc..000 --- a/net/ipv6/route.c +++ b/net/ipv6/rout

linux-next: build warnings after merge of the l2-mtd tree

unction] Introduced by commit c3a02f171365 ("mtd: cfi_cmdset_0002: Support Persistent Protection Bits (PPB) locking"). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp4t_J_4Vcm_.pgp Description: PGP signature

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

x27;) [-Werror] Caused by commit 1c53a270724d ("perf/POWER7: Make generic event translations available in sysfs"). I have used the tip tree from 20130128 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp7Hn9uNZUOP.pgp Description: PGP signature

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

int', but argument 3 has type 'phys_addr_t' [-Wformat] Introduced by commit 5dfd486c4750 ("x86, kvm: Fix kvm's use of __pa() on percpu areas"). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpKZq1GypVXI.pgp Description: PGP signature

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

upport") and c7c9c56ca26f ("x86, apicv: add virtual interrupt delivery support") from the kvm tree. I fixed it up (by applying the merge fix patch below) and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Sat, 2 Feb 2013 16:43:02 +1100 Subject:

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

(near initialization for 'x86_hyper_kvm.x2apic_available') [enabled by default] Introduced by commit 4cca6ea04d31 ("x86/apic: Allow x2apic without IR on VMware platform"). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp34ZuUX_q9y.pgp Description: PGP signature

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

ithout a cast [enabled by default] arch/x86/include/asm/page_64.h:12:29: note: expected 'long unsigned int' but argument is of type 'void *' Introduced by commit a25b9316841c ("x86, mm: Make DEBUG_VIRTUAL work earlier in boot"). -- Cheers, Stephen Rothwell

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

PU_CP15=n") from the cortex 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/cputype.h index ad41ec2,574269e..000 --- a/arch/arm/include/asm/cputype

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

b884c09 ("ARM: tegra: Add initial support for Tegra114 SoC") 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 arch/arm/mach-tegra/common.c index 3599

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

arm-soc tree and commits 89572c77cdff ("ARM: tegra: move tegra_cpu_car.h to linux/clk/tegra.h") and a8a6930157e0 ("ARM: tegra: Use DT /cpu node to detect number of CPU core") from the tegra tree. I fixed it up (see below) and can carry the fix as necessary (no actio

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

t;) 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 include/asm-generic/vmlinux.lds.h index fc62ac5,c1fe60a..000 --- a/include/asm-generic/vmlinux.lds.h

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

n_single()" from the akpm-current 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/smp.c index 69f38bd,bb92c52..000 --- a/kernel/smp.c +++ b/kernel

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

rent 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/rtc/rtc-stmp3xxx.c index cc9a9b6,b2a8ed9..000 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-stmp3xx

Re: linux-next: manual merge of the cortex tree with the arm tree

n that case. Rats! This was the automatically resolved part of the merge resolution. I will fix it up (it caused a build failure in my arm defconfig build) and will carry that fix as well from now on. Thanks for letting me know. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpCZFScUGW3k.pgp Description: PGP signature

linux-next: Tree for Feb 2

onfigs 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 -- Cheers, St

Re: linux-next: New trees - ipsec and ipsec-next

to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au Legal Stuff: By participating in linux-next, your subsystem tree contributions are public and will be included in the linux-next trees. You may be sent e-mail messages indicating errors or other issues w

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

Hi, On Thu, 24 Jan 2013 18:30:40 +0800 Shaohua Li wrote: > > On Thu, Jan 24, 2013 at 04:54:48PM +1100, Stephen Rothwell wrote: > > > > After merging the final tree, today's linux-next build (sparc32 defconfig) > > failed like this: > > > > arch/

linux-next: Tree for Jan 25

eidel.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 (ba2ab41 Merge tag 'pm+acpi-for-3.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/ra

Re: linux-next: Tree for Jan 25 (kvm)

On Fri, 25 Jan 2013 08:53:58 -0800 Randy Dunlap wrote: > > Seeing lots of this error on i386: > > arch/x86/kvm/emulate.c:1016: Error: unsupported for `push' Caused by commit 9ae9febae950 ("KVM: x86 emulator: covert SETCC to fastop") from the kvm tree. cc's adde

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

") from the tty tree. I fixed it up (see below - I am not sure if GOLDFISH_EVENTS needs TTY or not) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/input/keyboard/Kconfig index 078305e,008f9

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

t;) from the usb 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/Kconfig index a1bd951,6665d25..000 --- a/drivers/usb/gadget/Kconfig +++ b/drivers/usb/

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

the usb tree. I fixed it up (the latter removed the code modified by the former, so I did that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpCshyXvM30c.pgp Description: PGP signature

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

I fixed it up (I wasn't sure how, so I effectively dropped the former change) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp3m8uXa4UVm.pgp Description: PGP signature

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

licit-function-declaration] Caused by commit 88bb965ed711 ("usb: Register usb port's acpi power resources"). I have used the usb tree from next-20130125 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpheH6jVtBlH.pgp Description: PGP signature

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

port use of GPIO5 as an input to jack detection") from 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 include/linux/mfd/arizona/pdata.h index ec3e2a2,bcbe4

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

gle()" from the akpm tree. I fixed it up (maybe - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc kernel/smp.c index 93e576e,51a81b0..000 --- a/kernel/smp.c +++ b/kernel/smp.c @@@ -3

linux-next: Tree for Jan 28

rs/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 Fra

linux-next: please clean up

Hi all, As your work is merged by upstream trees, please clean up your linux-next included branches. A big thanks to those who already do this in a timely fashion. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpaaDtRS04nC.pgp Description: PGP signature

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

om the metag 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 mm/page_alloc.c index e9075fd,4c99cb7..000 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@@ -332,8 -319,8 +

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

). I have used the kbuild tree from next-20130222 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpK4s2ijDqeA.pgp Description: PGP signature

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

watchdog 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/rtc/rtc-stmp3xxx.c index b2a8ed9,cc9a9b6..000 --- a/drivers/rtc/rtc-stmp3xxx.c +++ b/drivers/rtc/rtc-st

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

and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/sysfs/bin.c index 2ce9a5d,f186e27..000 --- a/fs/sysfs/bin.c +++ b/fs/sysfs/bin.c @@@ -468,8 -467,8 +467,8 @@@ void unmap_bin_file(struct sysfs_di

linux-next: Tree for Feb 23

ilers/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: build failure after merge of the kbuild tree

Hi Michal, On Mon, 25 Feb 2013 11:28:40 +0100 Michal Marek wrote: > > On 25.2.2013 00:56, Stephen Rothwell wrote: > > > > After merging the kbuild tree, today's linux-next build (powerpc > > ppc64_defconfig) failed like this: > > > > scripts/link-v

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

On Mon, 25 Feb 2013 21:58:45 +1100 Stephen Rothwell wrote: > > But bash in sh mode does not work: The bash manual says: . filename [arguments] source filename [arguments] Read and execute commands from filename in the current shell envir

Re: [PATCH] kbuild: Fix reading of .config in link-vmlinux.sh

; > Force reading the file from the current directory if $KCONFIG_CONFIG > > contains no '/'. > > > > Reported-by: Stephen Rothwell > > Signed-off-by: Michal Marek > > --- > > scripts/link-vmlinux.sh |9 - > > 1 file changed,

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

e memory windows in {INIT, QUERY}_HCA") from the infiniband 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/mlx4.h index ed4a695,8b75

linux-next: Tree for Feb 24

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 (ab78265 Merge tag 'mfd-3.9-1' of git://git.ker

Re: linux-next: Tree for Feb 24

Hi, On Tue, 26 Feb 2013 06:00:24 +0100 Sedat Dilek wrote: > > February 26th... Yeah :-( -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpBu5C4PhYDA.pgp Description: PGP signature

Re: linux-next: JFFS2 deadlock

; [4.021802] [] (filldir+0x5c/0x158) from [] > (jffs2_readdir+0xdc/0x1a8) > [4.030502] [] (jffs2_readdir+0xdc/0x1a8) from [] > (vfs_readdir+0x98/0xb4) > [4.039477] [] (vfs_readdir+0x98/0xb4) from [] > (sys_getdents+0x74/0xd0) > [4.048270] [] (sys_getdents+0x74/0xd0) from [] > (ret_fast_syscall+0x0/0x3c) -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpaOz_CkGsJp.pgp Description: PGP signature

Re: linux-next: JFFS2 corruption

om [] > (lock_acquire+0x9c/0x104) > [3.903553] [] (lock_acquire+0x9c/0x104) from [] > (might_fault+0x60/0x90) > [3.912427] [] (might_fault+0x60/0x90) from [] > (filldir+0x5c/0x158) > [3.920844] [] (filldir+0x5c/0x158) from [] > (jffs2_readdir+0xdc/0x1a8) > [

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

devices with DT reference") 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/mach-shmobile/setup-sh73a0.c index bdab575,6e80c5d..000 ---

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

(see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/proc/inode.c index 70322e1,b4625dd..000 --- a/fs/proc/inode.c +++ b/fs/proc/inode.c @@@ -495,7 -499,8 +496,7 @@@ int proc_fill

linux-next: Tree for Feb 27

ere 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 (1cef935 Merge git://git.kernel.or

Re: linux-next: Tree for Feb 23 [ perf: NULL pointer dereference perf_init_event() ]

> ... > >> > >> Regards, > >> - Sedat - > > > > I see the same call-traces with today's Linux-Next (next-20130226)! > > Any hints/help? > > > > - Sedat - > > [ CC Tejun and Borislav ] > > This turned out to be a idr issue [1]. Thanks Borislav for his help. > > Reverting "idr: implement lookup hint" commit [2] makes the call-traces go > away. > > - Sedat - > > [1] http://marc.info/?l=linux-kernel&m=136197056415722&w=2 > [2] > http://git.kernel.org/?p=linux/kernel/git/next/linux-next.git;a=commit;h=29cf29e1fbb875019713eb55cf27ec35f1e5fa5e -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpfVKN3dbmIY.pgp Description: PGP signature

Re: [PATCH] Consolidate CONFIG_DEBUG_STRICT_USER_COPY_CHECK

size is not provably correct [enabled by default] -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpU8xPc9O5qQ.pgp Description: PGP signature

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

it "hlist: drop the node parameter from iterators" from the akpm tree interacting with commits b5dc50616996 ("A cache policy that uses a multiqueue ordered by recent hit") and 9c44464a0aed ("A simple cache policy that writes back all data to the origin") from the d

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

44464a0aed ("A simple cache policy that writes back all data to the origin") from the device-mapper tree. I added the following fix patch for today: From 0fe0a64ba2a600a10725318998c19e0b3820e6d7 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Thu, 28 Feb 2013 13:11:49 +1100 Subject: [PATCH] md: use of vmalloc et

linux-next: Tree for Feb 28

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 (309667e Merge branch 'kconfig' of gi

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

rom the nfsd 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/nfsd/nfscache.c index da3dbd0,ca43664..000 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c

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

nous") interacting with commit 77102893ae68 ("SUNRPC: Nuke the tk_xprt macro") from Linus' tree. I have no idea how to fix this, so I have used the version of the nfsd tree from next-20130228 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpucz3wQmAKc.pgp Description: PGP signature

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

omm_session_timeout using freed session") from the bluetooth tree. I fixed it up (I just used the bluetooth tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpcFOfDUDxR5.pgp Description: PGP signature

linux-next: interesting commits in the cifs tree

e from you. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpZupU_5mhjq.pgp Description: PGP signature

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

I assume that the problem fixed by the net tree commit is fixed some other way in the net-next tree, so I reverted the net tree commit. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpGk9ExDXXm6.pgp Description: PGP signature

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

Hi Daniel, On Fri, 15 Feb 2013 08:16:26 -0800 Jesse Barnes wrote: > > On Fri, 15 Feb 2013 10:30:16 +0100 > Daniel Vetter wrote: > > > On Fri, Feb 15, 2013 at 3:37 AM, Stephen Rothwell > > wrote: > > > > > > After merging the drm-in

Re: Linux 3.8

> Release". It sounds more planned that way, no? So, presumably the merge window is open and Linus will start pulling trees shortly. So, here I go again: Please do *not* rebase your tree before asking Linus to pull it. -- Cheers, Stephen Rothwells...@canb.a

linux-next: manual merge of the akpm tree with the wireless-next 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 net/mac80211/mesh_pathtbl.c index 6b3c4e1,ddf48f6..000 --- a/net/mac80211/mesh_pathtbl.c +++ b/net/mac80211/mesh_pathtbl.c @@

Re: ARC Port's linux-next URL update

in -next for 2 days, so maybe a couple of days wait wouldn't hurt. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp7DcDaK28aC.pgp Description: PGP signature

Re: [GIT PULL UPDATED] workqueue core changes for 3.9-rc1

| 17 +- tools/perf/Makefile|2 +- tools/vm/.gitignore |2 - 648 files changed, 4685 insertions(+), 6771 deletions(-) -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpTS1P8AT38z.pgp Description: PGP signature

Re: [GIT PULL UPDATED] workqueue core changes for 3.9-rc1

HI Tejun, On Wed, 20 Feb 2013 11:11:25 +1100 Stephen Rothwell wrote: > > This is very different from what has been in linux-next (it looks like > you have been cherry-picking fixes from other sources into your for-next > branch?): Or maybe what is in linux-next is a mash u

Re: [GIT PULL UPDATED] workqueue core changes for 3.9-rc1

Hi Tejun, On Tue, 19 Feb 2013 16:19:25 -0800 Tejun Heo wrote: > > On Wed, Feb 20, 2013 at 11:14:13AM +1100, Stephen Rothwell wrote: > > > > On Wed, 20 Feb 2013 11:11:25 +1100 Stephen Rothwell > > wrote: > > > > > > This is very different from

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

Hi Ralf, On Mon, 18 Feb 2013 10:43:40 +1100 Stephen Rothwell wrote: > > After merging the mips tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > drivers/ssb/driver_gpio.c: In function 'ssb_gpio_chipco_to_irq': > drivers/ssb/dr

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

ndling of devices depending on power resources") from the 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 drivers/pci/pci-acpi.c index c685ff5,e407c61..000 --- a/d

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

t: remove depends on CONFIG_EXPERIMENTAL") 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/vhost/Kconfig index 613b074,bf24317..000 --- a/dr

linux-next: manual merge of the vhost tree with the virtio tree

host 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/vhost/Makefile index 1d37f5e,1a8a4a5..000 --- a/drivers/vhost/Makefile +++ b/drivers/vhost/Makefile @

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

ng merge fix patch and can carry it as necessary: From 66e8d9a9dc648db6abc27b7e9b6d99840b25642f Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Wed, 20 Feb 2013 16:47:58 +1100 Subject: [PATCH] remoteproc: fix for dfeatures change Signed-off-by: Stephen Rothwell --- drivers/remoteproc/remoteproc_virt

linux-next: manual merge of the akpm tree with the net-next 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 --git a/net/core/net-procfs.c b/net/core/net-procfs.c index 0f6bb6f..3174f19 100644 --- a/net/core/net-procfs.c +++ b/net/core/net-procfs.c @

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

x27; token Caused by commit c4b75b428da3 ("hlist: drop the node parameter from iterators") interacting with commit 53643a75b147 ("qlcnic: fix ping resumption to a VM after a live migration") from the net-next tree. I applied this merge fix: From: Stephen Rothwell Date: Wed, 20

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

int', but argument 3 has type 'unsigned int' [-Wformat] Introduced by commit ef25bb0fa6e2 ("block/partitions/efi.c: ensure that the GPT header is at least the size of the structure"). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpTTipSJ6gHM.pgp Description: PGP signature

Re: [PATCH] block/partitions/efi.c: ensure that the GPT header is at least the size of the structure.

oo small: %u < > %lu\n", > + le32_to_cpu((*gpt)->header_size), > + (unsigned long)sizeof(gpt_header)); Don't do this. We have %zu to print size_t variables ... -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp7P5Z8tt8RC.pgp Description: PGP signature

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

rom sprom struct for gige driver") from the net-next tree. I fixed it up (the latter seems to supercede the former, so I used that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpm0DusOqeyK.pgp Description: PGP signature

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

Hi all, On Thu, 14 Feb 2013 13:30:16 +1100 Stephen Rothwell wrote: > > After merging the tip tree, today's linux-next build (x86_64 allmodconfig) > failed like this: > > drivers/thermal/intel_powerclamp.c: In function 'clamp_thread': > drivers/thermal

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

quot;powerpc: switch to generic sigaltstack") from the signal 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 arch/powerpc/kernel/signal_32.c index e4a88d3,80

Re: linux-next: manual merge of the signal tree with the powerpc tree

Hi Ben, On Thu, 21 Feb 2013 14:43:49 -0600 Michael Neuling wrote: > > Benjamin Herrenschmidt wrote: > > > On Thu, 2013-02-21 at 15:52 +1100, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the signal tree got conflicts in > > > a

Re: [PATCH 01/11] ARM: disable virt_to_bus/virt_to_bus almost everywhere

rches and your's will take care of metag/arc. The easiest way would be to put the follow up patches in Andrew's patch set (since it is still based on top of linux-next). It usually is merged pretty late, so I would get your own trees merged ASAP and this can be taken care of when Andrew sends his patch set to Linus. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpKDIMDbq3ss.pgp Description: PGP signature

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

to ethtool reporting") from the infiniband tree. I fixed it up (using the latter version as it included the change to use strlcpy) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpdSUPsDmCjK.pgp Description: PGP signature

linux-next: manual merge of the writeback tree with the btrfs tree

if_idle() and rename them") from the writeback tree. I fixed it up (I assumed that the former supercedes the latter and used that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpBWcad_ACJ7.pgp Description: PGP signature

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

ot; from the akpm-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 fs/btrfs/file.c index 8614c5b,39f556f..000 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@@ -3

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

Probably caused by commit 16ea975eac67 ("drm/tilcdc: add TI LCD Controller DRM driver (v4)") which forced CONFIG_DRM_GEM_CMA_HELPER to 'y'. dma_alloc/free_writecombine are only defined on ARM. I added this patch for today. From: Stephen Rothwell Date: Fri, 22 Feb 2013 15:1

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

- Cheers, Stephen Rothwells...@canb.auug.org.au pgp46ZOJtwDld.pgp Description: PGP signature

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