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

2017-11-09 Thread David Miller
From: Stephen Rothwell Date: Fri, 10 Nov 2017 10:31:00 +1100 > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_basic.c > net/sched/cls_u32.c > > between commits: > > 0b2a59894b76 ("cls_basic: use tcf_exts_get_net()

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

2017-11-09 Thread Cong Wang
On Thu, Nov 9, 2017 at 3:31 PM, Stephen Rothwell wrote: > I fixed it up (I think - see below) and can carry the fix as necessary. > 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

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

2017-10-30 Thread Mark Brown
On Mon, Oct 30, 2017 at 10:43:07AM -0700, Jakub Kicinski wrote: > On Mon, 30 Oct 2017 17:02:24 +, Mark Brown wrote: > > is submitted for merging. You may also want to consider cooperating > > with the maintainer of the conflicting tree to minimise any particularly > > complex conflicts. >

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

2017-10-30 Thread Jakub Kicinski
On Mon, 30 Oct 2017 17:02:24 +, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/netronome/nfp/flower/action.c > > between commit: > > d309ae5c6a0064 ("nfp: refuse offloading filters that redirects to upper >

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

2017-05-02 Thread David Miller
From: Stephen Rothwell Date: Wed, 3 May 2017 11:07:03 +1000 > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > arch/avr32/include/uapi/asm/socket.h > > between commit: > > 26202873bb51 ("avr32: remove support for AVR32 architecture")

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

2017-03-23 Thread Alexei Starovoitov
On 3/23/17 5:10 PM, David Miller wrote: From: Stephen Rothwell Date: Fri, 24 Mar 2017 11:05:14 +1100 Hi all, Today's linux-next merge of the net-next tree got a conflict in: kernel/bpf/hashtab.c between commit: 8c290e60fa2a ("bpf: fix hashmap extra_elems logic")

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

2017-03-23 Thread David Miller
From: Stephen Rothwell Date: Fri, 24 Mar 2017 11:05:14 +1100 > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > kernel/bpf/hashtab.c > > between commit: > > 8c290e60fa2a ("bpf: fix hashmap extra_elems logic") > > from Linus' tree

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

2017-02-02 Thread Yotam Gigi
>-Original Message- >From: netdev-ow...@vger.kernel.org [mailto:netdev-ow...@vger.kernel.org] On >Behalf Of Stephen Rothwell >Sent: Thursday, February 02, 2017 3:50 AM >To: David Miller ; Networking >Cc: linux-n...@vger.kernel.org;

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

2016-03-15 Thread Gregory CLEMENT
Hi Stephen, On mar., mars 15 2016, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > arch/arm/boot/dts/armada-xp-db.dts > arch/arm/boot/dts/armada-xp-gp.dts > arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

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

2015-07-14 Thread Nikolay Aleksandrov
On 07/14/2015 03:46 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/bridge/br_mdb.c between commit: f1158b74e54f (bridge: mdb: zero out the local br_ip variable before use) from Linus' tree and commit: 74fe61f17e99

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

2015-05-28 Thread Tom Lendacky
On 05/27/2015 11:17 PM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in drivers/net/phy/amd-xgbe-phy.c between commit 983942a5eaca (amd-xgbe-phy: Fix initial mode when autoneg is disabled) from Linus' tree and commit 7c12aa08779c (amd-xgbe: Move