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

ts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/sched/cls_basic.c index e43c56d5b

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

Hi Dave, On Tue, 7 Nov 2017 11:02:48 +1100 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > Hi all, > > After merging the netfilter-next tree, today's linux-next build (powerpc > ppc64_defconfig) produced this warning: > > net/netfilter/nf_conntrac

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

lso want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc tools/Makefile index c03b4f69d5b7,9d2fd2606810.. --- a/tools/Makefile +++ b/tools/Makefile @@@ -58,7 -58,7 +59,7 @@@ acpi: FO

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

been better? Well, it would not have caused a conflict. -- Cheers, Stephen Rothwell

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

imise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/net/inet_sock.h index 2135c9ba6ac3,21c3e4d73b88.. --- a/include/net/inet_sock.h +++ b/include/net/inet_sock.h @@@ -92,12 -90,10 +90,11 @@@ stru

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

... -- Cheers, Stephen Rothwell

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

m the tip tree. Looks like the LOCKDEP sage version of timer_setup() needs to put parentheses around the usages of its parameters? -- Cheers, Stephen Rothwell

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

but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

ssary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

lso want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/sched/cls_api.c index b2d310745487,d9d54b367d23.. --- a/net/sched/cls_api.c +++ b/net/sched/cls_api.c @@@ -28

linux-next: Signed-off-by missing for commit in the net-next tree

Hi all, Commit 509708310cf9 ("r8169: Add support for interrupt coalesce tuning (ethtool -C)") is missing a Signed-off-by from its author (or its author is wrong). -- Cheers, Stephen Rothwell

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

sed by commit 0115dcd1787d ("net: dsa: use slave device phydev") Interacting with commit e804441cfe0b ("net: dsa: Fix network device registration order") from the net tree. I applied the following merge fix patch (which I am not sure about): From: Stephen Rothwell <s

linux-next: Signed-off-by missing for commit in the net-next tree

Hi all, Commit 8f1975e31d8e ("inetpeer: speed up inetpeer_invalidate_tree()") is missing a Signed-off-by from its author. -- Cheers, Stephen Rothwell

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

commit 6e617de84e87 ("net: avoid a full fib lookup when rp_filter is disabled.") This build has CONFIG_IP_MULTIPLE_TABLES unset. I have reverted that commit for today. -- Cheers, Stephen Rothwell

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

lso want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc lib/kobject_uevent.c index f237a09a5862,147db91c10d0.. --- a/lib/kobject_uevent.c +++ b/lib/kobject_uevent.c @@@ -294,26 -294,5

linux-next: Signed-off-by missing for commit in the net tree

Hi all, Commit 129c6cda2de2 ("8139too: revisit napi_complete_done() usage") is missing a Signed-off-by from its author. -- Cheers, Stephen Rothwell

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

Hi Sinan, On Tue, 5 Sep 2017 18:54:38 -0400 Sinan Kaya <ok...@codeaurora.org> wrote: > > On 9/4/2017 12:54 AM, Stephen Rothwell wrote: > > Just a reminder that this conflict still exists. > > I suppose this was a message for Bjorn, right? Correct. It was just a r

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

. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/sh/configs/se7751_defconfig index 56b5e4ce8d4a,153e1d3c8be5.. --- a/arch/sh/configs/se7751_defconfig +

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

Hi Dave, On Thu, 31 Aug 2017 13:47:02 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > drivers/net/ethernet/cavium/liquidio/lio_main.c > > between commit: > > d1d97ee6e3a8 ("liquidi

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

Hi all, On Tue, 22 Aug 2017 11:24:14 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/arm64/boot/dts/rockchip/rk3328-evb.dts > > between commits: > > ab78718bda79 ("arm64:

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

Hi all, On Wed, 16 Aug 2017 09:51:28 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > Today's linux-next merge of the pci tree got a conflict in: > > drivers/pci/probe.c > > between commit: > > a99b646afa8a ("PCI: Disable PCIe Relaxed Ordering

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

ur tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen Rothwell <s...@canb.auug.org.au> Date: Thu, 31 Aug 2017 13:42:50 +1000 Subject: [PATCH] liquidio: fix for merge

Re: linux-next: Signed-off-by missing for commit in the net-next tree

Hi David, On Wed, 30 Aug 2017 10:53:48 -0600 David Ahern <dsah...@gmail.com> wrote: > > On 8/30/17 10:51 AM, Stephen Rothwell wrote: > > Hi all, > > > > Commit > > > > 1b70d792cf67 ("ipv6: Use rt6i_idev index for echo replies to a local > &g

linux-next: Signed-off-by missing for commit in the net-next tree

Hi all, Commit 1b70d792cf67 ("ipv6: Use rt6i_idev index for echo replies to a local address") is missing a Signed-off-by from its author. -- Cheers, Stephen Rothwell

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

conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/marv

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

y non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/

Re: [PATCH] ARM: dts: rk3228-evb: Fix the compiling error

Hi Dave, On Sun, 27 Aug 2017 16:59:43 -0700 (PDT) David Miller <da...@davemloft.net> wrote: > > Sorry, I wasn't aware that this should go via my tree, I'll take care of > this soon. Thanks. -- Cheers, Stephen Rothwell

Re: [PATCH] ARM: dts: rk3228-evb: Fix the compiling error

Hi Dave (Miller), On Tue, 22 Aug 2017 21:52:51 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > Thanks. > > On Tue, 22 Aug 2017 17:24:25 +0800 David Wu <david...@rock-chips.com> wrote: > > > > This patch solves the following error: > &g

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

lso want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/ipv6/ip6_fib.c index a5ebf86f6be8,549aacc3cb2c.. --- a/net/ipv6/ip6_fib.c +++ b/net/ipv6/ip6_fib.c @@@ -160,12 -154,7 +16

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

, _cookie) || rt_cookie != cookie) ^ Introduced by commit c5cff8561d2d ("ipv6: add rcu grace period before freeing fib6_node") -- Cheers, Stephen Rothwell

Re: [PATCH] ARM: dts: rk3228-evb: Fix the compiling error

ss db40f15b53e4 ("ARM: dts: rk3228-evb: Enable the integrated PHY for > gmac") > Signed-off-by: David Wu <david...@rock-chips.com> Reported-by: Stephen Rothwell <s...@canb.auug.org.au> -- Cheers, Stephen Rothwell

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

y non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/boot/dts

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/pci/probe.c index e6a917b4acd3,d11fede6bd53.. --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@@ -1751,67 -1753

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

228-evb: Enable the integrated PHY for gmac") Its possible that the error is caused by an interaction with another commit, but I could not find anything obvious. I have reverted that commit for today. -- Cheers, Stephen Rothwell

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

rging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/boot/dts/rockchip/rk3328.dtsi index e6da0cee1241,d48bf5d9f8bd.. --- a/arch/arm64/boot/dts/rockch

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

fix up any conflicts when he next merges the net tree into the net-next tree. -- Cheers, Stephen Rothwell

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/ipv4/tcp_output.c index 276406a83a37,d49bff51bdb7.. --- a/net/ipv4/tcp_output.c +++ b/net/ipv4/tcp_output.c @@@ -2377,9 -2375

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/hyperv/netvsc.c index 96f90c75d1b7,9598220b3bcc.. --- a/drivers/net/hyperv/netvsc.c +++ b/drivers/net/hyperv/netvsc.c

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

NFIG_BPF=y # CONFIG_BPF_SYSCALL is not set I have used the net-next tree from next-20170717 for today. -- Cheers, Stephen Rothwell

Re: [RFC PATCH linus] tcp: md5: tcp_md5_do_lookup_exact() can be static

*sk, > + const union tcp_md5_addr > *addr, > + int family, u8 prefixlen) > { > const struct tcp_sock *tp = tcp_sk(sk); > struct tcp_md5sig_key *key; -- Cheers, Stephen Rothwell

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

Hi all, On Fri, 30 Jun 2017 16:32:41 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > After merging the akpm tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > In file included from include/linux/bitmap.h:8:0, > from in

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

Hi all, With the merge window opening, just a reminder that this conflict still exists. On Wed, 21 Jun 2017 11:54:43 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/wireless/marv

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

ainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/core/health.c index 8a8b5f0e497c,0648a6

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

. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm64/net/bpf_jit_comp.c index 8860bb9c33a1,2f0505b5c240.. --- a/arch/arm64/net/bpf_jit_comp.c +++ b/arch/arm6

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

eemed to work. From: Stephen Rothwell <s...@canb.auug.org.au> Date: Fri, 30 Jun 2017 16:24:35 +1000 Subject: [PATCH] net/mlx5: fix memcpy limit? Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au> --- drivers/net/ethernet/mellanox/mlx5/core/fpga/cmd.c | 2 +- 1 file changed, 1 i

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

rging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/rocker/rocker_ofdpa.c index a9ce82d3e9cf,bd0e3f157e9e.. --- a/drivers/net/ethernet/r

Re: Adding nfc-next to linux-next

* successfully 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

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

ur tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc Documentation/devicetree/bindings/net/ethernet.txt index d4abe9a98109,08dd263beeb9..

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

ts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/macvlan.c i

Re: new dma-mapping tree, was Re: clean up and modularize arch dma_mapping interface V2

Hi all, On Wed, 21 Jun 2017 15:32:39 +0200 Marek Szyprowski <m.szyprow...@samsung.com> wrote: > > On 2017-06-20 15:16, Christoph Hellwig wrote: > > On Tue, Jun 20, 2017 at 11:04:00PM +1000, Stephen Rothwell wrote: > >> git://git.linaro.org/people/mszyprowski/linux-

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

Hi Kalle, On Wed, 21 Jun 2017 16:29:29 +0300 Kalle Valo <kv...@codeaurora.org> wrote: > > Thanks, the fix looks good to me. I guess there's nothing I can do at > the moment and Linus needs to fix this when he pulls from Dave (or > Bjorn, whichever is the last)? Right. -

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

r when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/wireless/marvell/mwifiex/pcie.c index 279adf124fc9,b53ecf1eddda..00

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/core/rtnetlink.c index 467a2f4510a7,3aa57848a895.. --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@@ -1469,7 -1519,7 +1520,8 @@@ static con

Re: new dma-mapping tree, was Re: clean up and modularize arch dma_mapping interface V2

o fetch). It is allowed to be rebased if you deem it necessary. -- Cheers, Stephen Rothwell s...@canb.auug.org.au

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

Hi Dave, On Thu, 15 Jun 2017 12:08:08 -0400 (EDT) David Miller <da...@davemloft.net> wrote: > > From: Stephen Rothwell <s...@canb.auug.org.au> > Date: Tue, 13 Jun 2017 12:00:24 +1000 > > > On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <s...@canb.auug.org.

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

. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/batman-adv/routing.c index ae9f4d37d34f,1338b9221613.. --- a/net/batman-adv/routing.c +++ b/net/batman-adv/

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

by commit 773fc8f6e8d6 ("net: rps: send out pending IPI's on CPU hotplug") These builds have CONFIG_RPS not set. -- Cheers, Stephen Rothwell

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

Hi Dave, On Thu, 8 Jun 2017 12:27:59 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > After merging the wireless-drivers-next tree, today's linux-next build > (x86_64 allmodconfig) failed like this: > > drivers/net/wireless/quantenna/qtnfmac/core.c: In function &g

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

Hi Kalle, On Thu, 08 Jun 2017 15:07:00 +0300 Kalle Valo <kv...@codeaurora.org> wrote: > > Stephen Rothwell <s...@canb.auug.org.au> writes: > > > On Wed, 7 Jun 2017 19:43:18 -0700 Igor Mitsyanko > > <igor.mitsyanko...@quantenna.com> wrote: > >&

Re: next-20170608 build: 1 failures 4 warnings (next-20170608)

net_device' has > no member named 'destructor' Looks like Mark has found another one. -- Cheers, Stephen Rothwell

Re: kisskb: FAILED linux-next/s390-defconfig/s390x Thu Jun 08, 18:28

make[2]: *** [drivers/s390/net] Error 2 > make[1]: *** [drivers/s390] Error 2 > make: *** [sub-make] Error 2 Another one for the net tree ... I haven't actually even build tested this, but it seems obvious ... From: Stephen Rothwell <s...@canb.auug.org.au> Date: Thu, 8 Jun 201

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

- the net tree is based post v4.12-rc1 and contains fixes for the current merge window. -- Cheers, Stephen Rothwell

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

imilar) when he merges the wireless-drivers-next tree into the net-next tree. I will keep applying the patch each day until then. -- Cheers, Stephen Rothwell

linux-next: build failure after merge of the wireless-drivers-next tree

from the net tree. I applied this merge fix patch for today. From: Stephen Rothwell <s...@canb.auug.org.au> Date: Thu, 8 Jun 2017 12:24:08 +1000 Subject: [PATCH] qtnfmac: fix up for "net: Fix inconsistent teardown and release of private netdev state." Signed-off-by: Stephen Rothwe

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

river" from Linus' tree (v4.12-rc1). I applied the following merge fix patch for today. From: Stephen Rothwell <s...@canb.auug.org.au> Date: Thu, 8 Jun 2017 09:49:26 +1000 Subject: [PATCH] net: fix up for "Fix inconsistent teardown and release of private netdev state&qu

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

is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/phy/marvell.c index 57297ba23987,1a72bebc588a.. --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@@ -1082,119 -1133,106

Re: [PATCH net-next] powerpc: use asm-generic/socket.h as much as possible

Hi Michael, On Wed, 31 May 2017 20:15:55 +1000 Michael Ellerman <m...@ellerman.id.au> wrote: > > Stephen Rothwell <s...@canb.auug.org.au> writes: > > > asm-generic/socket.h already has an exception for the differences that > > powerpc needs, so just include

[PATCH net-next] powerpc: use asm-generic/socket.h as much as possible

asm-generic/socket.h already has an exception for the differences that powerpc needs, so just include it after defining the differences. Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au> --- arch/powerpc/include/uapi/asm/socket.h | 92 +- 1 file chan

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

Hi Dave, On Sun, 21 May 2017 23:14:10 -0400 (EDT) David Miller <da...@davemloft.net> wrote: > > From: Stephen Rothwell <s...@canb.auug.org.au> > Date: Mon, 22 May 2017 11:16:05 +1000 > > > After merging the net-next tree, today's linux-next build (powerpc &g

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

-( I have used the net-next tree from next-20170519 for today. -- Cheers, Stephen Rothwell

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

ed, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

Hi Jens, On Mon, 1 May 2017 19:09:34 -0600 Jens Axboe <ax...@kernel.dk> wrote: > > Indeed, I have warned Linus about it. Thanks Stephen. Thanks. BTW, (unusually) I did not see your pull request(s) ... -- Cheers, Stephen Rothwell

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

Hi all, On Tue, 18 Apr 2017 13:02:29 +1000 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > After merging the block tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > drivers/block/nbd.c: In function 'nbd_genl_connect': > drivers/block/n

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

ur tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

etlink: pass extended ACK struct to parsing functions") from the net-next tree. I have applied the following merge fix patch: From: Stephen Rothwell <s...@canb.auug.org.au> Date: Tue, 18 Apr 2017 12:59:05 +1000 Subject: [PATCH] nbd: fix up for nla_parse_nested() API change

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

ny particularly complex conflicts. From: Stephen Rothwell <s...@canb.auug.org.au> Date: Tue, 18 Apr 2017 10:16:03 +1000 Subject: [PATCH] bpf: merge fix for move of fixup_bpf_calls() Signed-off-by: Stephen Rothwell <s...@canb.auug.org.au> --- kernel/bpf/verifier.c | 8 1 file changed,

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

lso want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/pci/msi.c index 6b5eaf500a24,0042c365b29b.. --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@@ -975,28 -973,7 +

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

ainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

lso want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/sched/sch_generic.c index 1a2f9e964330,3e64d23e098c.. --- a/net/sched/sch_generic.c +++ b/net/sched/sch_generic.c @@@ -794,8 -794

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

lso want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/core/flow_dissector.c index d98d4998213d,5f3ae922fcd1.. --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c

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

far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheer

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

lso want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/core/secure_seq.c index d28da7d363f1,fb87e78a2cc7.. --- a/net/core/secure_seq.c +++ b/net/core/secure_seq.c @@@ -47,25 -45,8 +

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/usb/r8152.c index c34df33c6d72,3262a326aae6.. --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@@ -3698,

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

the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc kernel/bpf/hashtab.c index 361a69dfe543,343fb5394c95.. --- a/kernel/bpf/hashtab.c +++ b/kernel/bpf/hashtab.c @@@ -582,7 -609,20 +616,15 @@@ static void htab_elem_free_rcu(struc

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

ainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/broadcom/genet/bcmmii.c index 2f9281936f0e,8df47c

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

d*: Utilize Firmware 8.15.3.0") -- Cheers, Stephen Rothwell

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

tioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

er when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. P.S. the Signed-off-bys do not match the Author email addresses. -- Cheers, Stephen Rothwell

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

Hi Paul, On Mon, 13 Feb 2017 17:43:24 +1100 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > On Sun, 12 Feb 2017 20:37:48 -0800 "Paul E. McKenney" > <paul...@linux.vnet.ibm.com> wrote: > > > > I chickened out on that commit for this merge windo

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

Hi all, On Tue, 10 Jan 2017 10:59:27 +1100 Stephen Rothwell <s...@canb.auug.org.au> wrote: > > After merging the net-next tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > net/smc/af_smc.c: In function 'smc_splice_read': > net/smc/af_smc.c

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

ixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/arm/Kconfig index 08d6a701c4fd,8748353ed5e0.. --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -2,10 -2,10 +2,12 @@@ config AR

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

lso want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc arch/s390/net/bpf_jit_comp.c index b3b0af86b84e,b49c52a02087.. --- a/arch/s390/net/bpf_jit_comp.c +++ b/arch/s39

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc kernel/extable.c index bd82117ad424,e1359474baa5.. --- a/kernel/extable.c +++ b/kernel/extable.c @@@ -20,7 -20,7 +20,8 @@@ #include

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

consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/linux/filter.h index 0c1cc9143cb2,c6dd53e88711.. --- a/include/linux/filter.h +++ b/include/linux/filter.h @@@ -574,21 -561,8 +574,

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

Hi Dave, On Wed, 15 Feb 2017 22:27:46 -0500 (EST) David Miller <da...@davemloft.net> wrote: > > I applied the fix that synced the two header files already. Sorry about that, I missed it in checking your tree over breakfast :-) -- Cheers, Stephen Rothwell

<    1   2   3   4   5   >