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

h") 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/mfd/db8500-prcmu.c index e42a417,42f3afc..000 --- a/drivers/mfd/db8500-prcmu.c +++ b/d

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

tree. I fixed it up (the sys_clone stuff was removed by the latter - see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc arch/mips/kernel/syscall.c index d7feee0,b32466a..000 --- a/arch/mips/kernel/

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

ixed 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/mm/numa.c index a8483df,245a4ba..000 --- a/arch/x86/mm/numa.c +++ b/arch/x86/mm/numa.c @@@ -209,22 -213,27

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

pointer-cast] Caused by commit "memory-hotplug: common APIs to support page tables hot-remove" from the akpm tree interacting with commit 973dc4f3fad5 ("x86, mm: Remove early_memremap workaround for page table accessing on 64bit") from the tip tree. I applied the following mer

linux-next: Tree for Feb 4

nks 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.auug.org.au $

Re: linux-next: Tree for Feb 4

Hi James, On Mon, 4 Feb 2013 13:56:32 + James Hogan wrote: > > On 4 February 2013 07:39, Stephen Rothwell wrote: > > Merging signal/for-next (9005965 x86: convert to ksignal) > > CONFLICT (content): Merge conflict in arch/x86/Kconfig > > I think this conflict has b

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

_LOCAL | RTF_GATEWAY))) > > I believe that no change here is correct to do. RTF_LOCAL here is needed > only before Yoshifuji's "IPv6 rt->n removal" Thanks for the feedback. I have removed the " | RTF_LOCAL" from the merge resolution. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgp9LWRTV9W_k.pgp Description: PGP signature

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

Hi all, After merging the sound-asoc tree, today's linux-next build (x86_64 allmodconfig) failed like this: ERROR: "regmap_async_complete" [sound/soc/codecs/snd-soc-wm-adsp.ko] undefined! I have used the version of the sound-asoc tree from next-20130204 for today. -- Cheers, S

linux-next: Tree for Feb 5

ways 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: linux-next: arch/metag tree change

Hi James, On Tue, 5 Feb 2013 12:16:15 + James Hogan wrote: > > Please can you update the git url of the arch/metag tree in -next to: > git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git for-next Done. -- Cheers, Stephen Rothwells...@canb.au

linux-next: manual merge of the metag tree with the arc 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 tools/perf/perf.h index 8a68ad3,768507e..000 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h @@@ -98,12 -98,12 +98,18 @@@

linux-next: manual merge of the crypto 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 --cc crypto/ctr.c index 1f2997c,095dcb6..000 --- a/crypto/ctr.c +++ b/crypto/ctr.c @@@ -335,40 -324,18 +335,38 @@@ static void cr

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

xx_compatibility_check' defined but not used [-Wunused-function] Caused by commit 8722ff8cdbfa ("block: IBM RamSan 70/80 device driver") interacting with commit 54b956b90360 ("Remove __dev* markings from init.h") from Linus' tree (as of v3.8-rc4). I added the following

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

t touch VBUSOVV bits") 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.h index fa7173d,b9a6a84..000 --- a/include/

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

and error") from the spi tree. I fixed it up (the former removed a function modified by the latter) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpsqxc_RYO6z.pgp Description: PGP signature

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

O instructions") and 1c810636556c ("KVM: PPC: BookE: Implement EPR exit") from the 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 include/uapi/linux/kvm.h index 7f2

linux-next: manual merge of the driver-core tree with the spi 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/spi/spi-s3c64xx.c index 7cfbe9d,3d4a7c4..000 --- a/drivers/spi/spi-s3c64xx.c +++ b/

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

()") 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/iommu/tegra-smmu.c index 7747283,f08dbcd..000 --- a/drivers/iommu/tegra-smmu.c

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

akpm tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc fs/nfsd/nfscache.c index d16a5d6,30c27eb..000 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache.c @@@ -254,9 -165,11 +25

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

n of function 'register_page_bootmem_info_node' [-Werror=implicit-function-declaration] Presumably caused by commit "mm: break circular include from linux/mmzone.h". That is a very optimistic patch :-) I have reverted that commit for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpjgQl0sARmI.pgp Description: PGP signature

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

-Werror=implicit-function-declaration] arch/sparc/kernel/kgdb_32.c:46:26: error: initialization makes pointer from integer without a cast [-Werror] I can only imagine that the implicit include of linux/sched.h got removed in one of our include file changes. :-( I have added this patch for today: Fro

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

Hi all, On Wed, 6 Feb 2013 18:30:40 +1100 Stephen Rothwell wrote: > > After merging the final tree, today's linux-next build (sparc defconfig) > failed like this: > > arch/sparc/kernel/kgdb_32.c: In function 'sleeping_thread_to_gdb_regs': > arch/sparc/kerne

kvmtool tree (Was: Re: [patch] config: fix make kvmconfig)

oes not, of course, rule out it being reinstated if Linus can be convinced. Nor does it make a judgement on the project itself, it is just because linux-next is meant to represent what is to be merged into Linus' tree in the next merge window. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpC9fQffUlXa.pgp Description: PGP signature

linux-next: manual merge of the tip tree with the s390 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 arch/s390/Kconfig index 17775cf,c15ba7d..000 --- a/arch/s390/Kconfig +++ b/arch/s390/Kconfig @@@ -91,56 -128

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

EXIT_REASONS array") from the kvm tree. The section modified by the latter has been moved to arch/x86/include/uapi/asm/vmx.h, so my fix up patch for that file now is below and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Thu, 7 Feb 2013 14:15:07 +11

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

of dma-mapping.h in setup-r8a7740.c") and e67d7afc5674 ("ARM: shmobile: r8a7740: add TMU timer support") 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.a

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

ng DT") 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-sh73a0.c index 36c2b2e,2ecd668..000 --- a/arch/arm/mach-shmo

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

99c289a ("s390: switch to generic old sigaction()") 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/s390/Kconfig index b220e15,ec12a35..000

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

ixed it up (the conflicts were caused by bad white space changes in the akpm tree patch) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpAx1P0TP4Ke.pgp Description: PGP signature

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

white space changes to lines not otherwise touched by the patch and those white space changes introduced extra levels of tabs (so the indentation was incorrect) and merged some lines. I unmucked some of it, but got bored :-) -- Cheers, Stephen Rothwells...@canb.auug.org.au

Re: kvmtool tree (Was: Re: [patch] config: fix make kvmconfig)

ng as you don't use it explicitly > (such as its 'make kvmconfig' feature - which is rather handy) > it never actually broke anything. I don't doubt any of that, it is just that Linus has explicitly said that he will not pull it into his tree. Thus, it

Re: kvmtool tree (Was: Re: [patch] config: fix make kvmconfig)

I think it would be better off as a separate project." -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpy80DwKydMR.pgp Description: PGP signature

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

e_stream' sound/soc/soc-core.c:3556:26: error: 'const struct snd_soc_dai_ops' has no member named 'mute_stream' Caused by commit df6dc7a26e7d ("ASoC: core: Allow digital mute for capture"). I have used the sound-asoc tree from next-20130207 for today. --

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

dt driver") from the 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/watchdog/Kconfig index 26e1fdb,3cc04ea..000 --- a/drivers/watchdog/Kconfig +++ b

Re: [PATCH 4/8] cputime: Generic on-demand virtual cputime accounting

NFIG_TASK_DELAY_ACCT=y I don't know if that was deliberate, but it was suprising. I noticed when this patch entered next-20130207. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpboaKlb6XJm.pgp Description: PGP signature

Re: [PATCH 4/8] cputime: Generic on-demand virtual cputime accounting

Hi Frederic, On Fri, 8 Feb 2013 14:07:49 +1100 Stephen Rothwell wrote: > > This patch has the side effect of changing the default configurations: > (This is PowerPC pseries_defconfig before/after this patch) > > @@ -119,8 +120,8 @@ > # > # CPU/Task time

[PATCH] cputime: restore CPU_ACCOUNTING config defaults for PPC64

Commit abf917cd91cb ("cputime: Generic on-demand virtual cputime accounting") inadvertantly changed the default CPU_ACCOUNTING config for PPC64. Repair that. Signed-off-by: Stephen Rothwell --- init/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init/Kcon

Re: linux-next build conflict between modules and metag trees (LOCKDEP_NOW_UNRELIABLE)

Linus' tree. However, such a merge should explain why it is being done. Assuming that the thing you merge does not get rebased - which in this case, Rusty has said it won;t be. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpRRP2QDrAUA.pgp Description: PGP signature

Re: [GIT PULL] f2fs fixes for v3.8-rc7

ee to fetch/cherry-pick or simply pull from > > git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git f2fs > > - that branchlet grows directly off the mainline and it's not going to > be rebased... Please pull/merge it directly, do not cherry-pick the p

Re: WARNING: at lib/debugobjects.c:261 debug_print_object()

Hi Fengguang, On Fri, 8 Feb 2013 13:56:05 +0800 Fengguang Wu wrote: > > I got the below oops and the first bad commit is > > commit 457583af4aef89d5252769ea290a2acc89e2361f > Author: Stephen Rothwell > Date: Mon Feb 4 18:12:17 2013 +1100 > > memory-hotplug: com

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

acpi tree. I fixed it up (The latter removed the lines 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 pgptZ93hk8Qti.pgp Description: PGP signature

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

cmdline param") from the acpi tree. I fixed it up (the latter removed the function 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 pgp6pYhTplyZe.pgp Description: PGP signature

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

tree and commit afb43e6d88e5 ("wlcore: remove if_ops from platform_data") from the wireless-next tree. I fixed it up (see below) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au diff --cc drivers/net/wirele

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

m mmu initialization from exynos tree") from the iommu 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/mach-exynos5-dt.c index ea9e302,2671075..00

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

_EXPERIMENTAL") from the driver-core tree. I fixed it up and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpmVEx1EKJ33.pgp Description: PGP signature

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

mit 3d55399391c8 ("pcmcia: synclink_cs: cleanup checkpatch warnings") 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 drivers/char/pcmcia/synclink_

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

omap-twl4030 machine 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 --cc arch/arm/mach-omap2/board-3430sdp.c index 2a739b2,4f17339..000 --- a/

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

common omap-twl4030 machine 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 --cc arch/arm/mach-omap2/board-zoom-peripherals.c index dc5498b,07

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

obsolete pm_lats and early_device code") 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/usb-host.c index 940aad4,99f04de..000 ---

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

ed by commit c07cb4b0ab78 ("net/mlx4_en: Manage hash of MAC addresses per port") from the net-next tree interacting with commit "hlist: drop the node parameter from iterators" from the akpm tree. I applied the following merge fix patch for today: From 7a10f5e7e8d1232d618307d568ea

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

name pm_idle to sparc_idle") from the acpi tree. I have applied this patch for today: From: Stephen Rothwell Date: Mon, 11 Feb 2013 18:30:19 +1100 Subject: [PATCH] sparc idle: protect variable declarations against the assembler Signed-off-by: Stephen Rothwell --- arch/sparc/include/asm/proces

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

Hi all, On Mon, 11 Feb 2013 08:47:54 +0200 Luciano Coelho wrote: > > On Sun, 2013-02-10 at 18:58 -0800, Joe Perches wrote: > > On Mon, 2013-02-11 at 13:33 +1100, Stephen Rothwell wrote: > > > > > > Today's linux-next merge of the wireless-next tree got conflic

Re: WARNING: at lib/debugobjects.c:261 debug_print_object()

Hi Fengguang, On Mon, 11 Feb 2013 21:25:56 +0800 Fengguang Wu wrote: > > Stephen, build failed after reverting the commit, however next-20130208 > no longer has the problem. So we may probably forget about it. OK, thanks. -- Cheers, Stephen Rothwells...@canb.au

Re: [PATCH v2] gpio: devm_gpio_* support should not depend on GPIOLIB

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

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

I fixed it up (since the former commit says that the latter is the more complex fix, I just used that) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpPOpb0d_gXg.pgp Description: PGP signature

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

ource") and ("arm64: move from arm_generic to arm_arch_timer") 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/clocksource/Kconfig i

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

common omap-twl4030 machine 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 --cc arch/arm/mach-omap2/board-zoom-peripherals.c index dc5498b,0745bd

Re: [PATCH] Centralise CONFIG_ARCH_NO_VIRT_TO_BUS

Hi James, On Mon, 11 Feb 2013 11:57:28 + James Hogan wrote: > > On 12/11/12 21:26, Stephen Rothwell wrote: > > Make if easier for more architectures to select it and thus disable > > drivers that use virt_to_bus(). > > > > Signed-off-by: Stephen Rothwell >

[PATCH] Centralise CONFIG_ARCH_NO_VIRT_TO_BUS

Change it to CONFIG_HAVE_VIRT_TO_BUS and set it in all architecures that already provide virt_to_bus(). Signed-off-by: Stephen Rothwell --- arch/Kconfig| 7 +++ arch/alpha/Kconfig | 1 + arch/arm/Kconfig| 1 + arch/avr32/Kconfig | 1 + arch/blackfin/Kconfig

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

of pm these days. OK, I have renamed your tree to "idle". -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpUjdeiV68QR.pgp Description: PGP signature

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

ing sysfs") from the ia64 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/firmware/efivars.c index f5596db,6922511..000 --- a/drivers/firmware/efivars

linux-next: manual merge of the tegra tree with the i2c tree

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/tegra.c index 6e1c9a9,84deeab..000 --- a/arch/arm/mach-tegra/tegra.c +++ b/arch/arm/mac

Re: [PATCH v2] cs5535-mfgpt: Add another reset method

remental fix patch as he does not rewrite his trees. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpqDSWKcDxms.pgp Description: PGP signature

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

as no member named 'dmarx' drivers/tty/serial/amba-pl011.c:1672:6: error: 'struct uart_amba_port' has no member named 'dmarx' Caused by commit cb06ff102e2d ("ARM: PL011: Add support for Rx DMA buffer polling"). This build does not have CONFIG_DMA_ENGINE set. I have reverted that commit for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpwAymCBYgcq.pgp Description: PGP signature

linux-next: Tree for Apr 2

ore 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 Rothwells...@c

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

;s tree due to a build error (after making the "correct" choice). It will be back in today. > I'll drop 40c275bd92b8 out of my tree so Al's can go in without a conflict. OK. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpq_Wxo6WK3l.pgp Description: PGP signature

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

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 ca05f6d,3af1767..000 --- a/fs/nfsd/nfscache.c +++ b/fs/nfsd/nfscache

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

ny, many more. Caused by commit 1f4fbcb8700c ("create_proc_cpu_mask() doesn't need an argument..."). Please build test this stuff *before* publishing it. :-( I have used the vfs tree from next-20130328 again fro today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpvtx6IclxVb.pgp Description: PGP signature

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

nect handling") 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/staging/media/go7007/go7007-driver.c index 6f83c52,a5ca99d..000 --- a/dri

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

bttv-input.c to bttv-i2c.c") from the v4l-dvb tree. The latter moved the code that the former modified, so I added the following fix patch and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Wed, 3 Apr 2013 12:10:05 +1100 Subject: [PATCH] i2c: fixup for code m

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

stuff into a struct") 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_panel.c index bee8cb6,0e7e873..000 --- a/drivers/

linux-next: manual merge of the akpm tree with Linus' 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 ipc/msg.c index 4eaf3fd,628c6ea..000 --- a/ipc/msg.c +++ b/ipc/msg.c @@@ -860,17 -860,8 +860,9 @@@ lo

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

the max and average time to search the cache") which adds a divide by u64 (num_searches). I have reverted that commit and the following one for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au http://www.canb.auug.org.au/~sfr/ pgpgR76op757D.pgp Description: PGP signature

linux-next: Tree for Apr 3

d 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 (2dc958f ipc: set

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

47:6: sorry, unimplemented: called from here Caused by commit dc351389caa5 ("ext4: introduce ext4_get_group_number()"). This build was done with gcc 4.6.3 if that matters. I have used the ext4 tree from next-20130403 for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpiZtAcF33sv.pgp Description: PGP signature

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

rent: use __GFP_ZERO instead of memset(, 0)") from the net-next tree. The former moved the code modified by the latter into a different file, so I added the following merge fix patch and can carry the fix as necessary (no action is required). From: Stephen Rothwell Date: Thu, 4 Apr 20

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

done x86_64-linux-gcc: warning: drivers/net/wireless/rtlwifi: linker input file unused because linking not done I have no idea what caused that. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgptmCwLCLw0i.pgp Description: PGP signature

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

Hi John, On Thu, 4 Apr 2013 12:00:43 +1100 Stephen Rothwell wrote: > > After merging the wireless-next tree, today's linux-next build (x86_64 > allmodconfig) produced this warning: > > x86_64-linux-gcc: warning: drivers/net/wireless/rtlwifi: linker input file > unused b

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

) from the block 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/block/drbd/drbd_proc.c index 928adb8,30fe0a5..000 --- a/drivers/block/drbd/drbd_proc.c

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

Hi Larry, On Wed, 03 Apr 2013 20:17:01 -0500 Larry Finger wrote: > > On 04/03/2013 08:04 PM, Stephen Rothwell wrote: > > > > On Thu, 4 Apr 2013 12:00:43 +1100 Stephen Rothwell > > wrote: > >> > >> After merging the wireless-next tree, today&#x

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

dling") from the usb-gadget 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 drivers/usb/host/ehci-tegra.c index 4f3cfb8,1d2488c..000 --- a/drivers/usb/host/e

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

node files") from the vfs tree and commit 433121c6ef51 ("staging: dgrp: cleanup sparse warnings") from the staging tree. The former removed the code modified by the latter, so I just did that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Roth

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

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

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

vfs tree and commit 515e6dd20b3f ("Staging: ccg: delete it from the tree") from the staging tree. The latter just deletes the files, so I did that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpL8GezJhBQs.pgp Description: PGP signature

linux-next: manual merge of the imx-mxs tree with the pm tree

cy-> members") from the pm tree and commit 180cb7d6ab8c ("ARM: imx: Remove cpufreq driver") from the imx-mxs tree. The latter removed the file, so I just did that and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwell

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

YSCALL_DEFINE") 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 fs/read_write.c index e7d7bde,f738e4d..000 --- a/fs/read_write.c +++ b/fs/read_wr

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

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 fs/compat.c index 5058345,b7a89b9..000 --- a/fs/compat.c +++ b/fs/compat.c @@@ -1069,26 -1064,195 +1

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

" from the akpm tree. It looks like they are trying to do the same thing, so I dropped the akpm tree version and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpbRUBwfqfhm.pgp Description: PGP signature

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

file_splice_write()". -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpR3piEBJIFJ.pgp Description: PGP signature

linux-next: manual merge of the akpm tree with the vfs 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/coredump.c index 69d5141,4201338..000 --- a/fs/coredump.c +++ b/fs/coredump.c @@@ -636,11 -641,8 +639,10 @@@ void

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

-in-proc-v5") as the conflicts are a bit complex. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpoF9JyhhHwU.pgp Description: PGP signature

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

b_start_write/sb_end_write out of ->aio_write()") from the vfs tree interacting with commit 61ead3d450a4 ("aio: kill ki_retry") from the akpm tree. I applied the following fix patch: From: Stephen Rothwell Date: Thu, 4 Apr 2013 17:41:59 +1100 Subject: [PATCH] aio: kill ki_

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

river"). I reverted commit 8b138d4898a0 ("rtlwifi: rtl8188ee: Enable build of new driver") for today. -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpmpiIlepMcg.pgp Description: PGP signature

linux-next: Tree for Apr 4

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 (da241ef Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net) Merging fixes/maste

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

n discussed on fsdevel and sat in #experimental for > several weeks; time for it to go into #for-next. It would have been useful to put something like that in the commit message ... -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpjJHBZAxhjc.pgp Description: PGP signature

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

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/kvm_host.h index 0f4941a,35b74cd..000 --- a/include/linux/kvm_host.h +++ b/include/linux/kvm_host.h @@@ -149,7 -149,7 +14

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

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/uapi/linux/kvm.h index 74d0ff3,61783ee..000 --- a/include/uapi/linux/kvm.h +++ b/include/uapi/linux/kvm.h @@@ -449,15

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

e dir") from the arm-soc tree. I fixed it up (just used the arm-soc tree version) and can carry the fix as necessary (no action is required). -- Cheers, Stephen Rothwells...@canb.auug.org.au pgpKw1t5yCfIO.pgp Description: PGP signature

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

Hi all, On Fri, 5 Apr 2013 15:33:35 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in > arch/arm/mach-spear/spear13xx.c between commit c79e33b3e828 ("ARM: > smp_twd: convert to use CLKSRC_OF init") from the xilinx tre

linux-next: manual merge of the imx-mxs tree with the pinctrl 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/pinctrl/Makefile index 82db76c,8bdaf23..000 --- a/drivers/pinctrl/Makefile +++ b/drivers/pinctrl/Makefile @@@ -

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