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

Hi all, On Thu, 15 Apr 2021 14:00:16 + "Ong, Boon Leong" wrote: > > I check linux-next merge fix above and spotted an additional fix needed. > Please see below. > > >+ /** > >+ * dma_recycle_rx_skbufs - recycle RX dma buffers > >+ * @priv: private structure > >+ * @queue: RX queue

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

>Hi all, > >Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/stmicro/stmmac/stmmac_main.c > >between commit: > > 00423969d806 ("Revert "net: stmmac: re-init rx buffers when mac resume >back"") > >from the net tree and commits: > > bba2556efad6 ("net:

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

On 3/19/21 4:33 PM, Alexei Starovoitov wrote: On Fri, Mar 19, 2021 at 8:17 AM Yonghong Song wrote: On 3/19/21 12:21 AM, Daniel Borkmann wrote: On 3/19/21 3:11 AM, Piotr Krysiuk wrote: Hi Daniel, On Fri, Mar 19, 2021 at 12:16 AM Stephen Rothwell wrote: diff --cc kernel/bpf/verifier.c

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

On Fri, Mar 19, 2021 at 8:17 AM Yonghong Song wrote: > > > > On 3/19/21 12:21 AM, Daniel Borkmann wrote: > > On 3/19/21 3:11 AM, Piotr Krysiuk wrote: > >> Hi Daniel, > >> > >> On Fri, Mar 19, 2021 at 12:16 AM Stephen Rothwell > >> wrote: > >> > >>> diff --cc kernel/bpf/verifier.c > >>> index

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

On 3/19/21 12:21 AM, Daniel Borkmann wrote: On 3/19/21 3:11 AM, Piotr Krysiuk wrote: Hi Daniel, On Fri, Mar 19, 2021 at 12:16 AM Stephen Rothwell wrote: diff --cc kernel/bpf/verifier.c index 44e4ec1640f1,f9096b049cd6.. --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c

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

On 3/19/21 3:11 AM, Piotr Krysiuk wrote: Hi Daniel, On Fri, Mar 19, 2021 at 12:16 AM Stephen Rothwell wrote: diff --cc kernel/bpf/verifier.c index 44e4ec1640f1,f9096b049cd6.. --- a/kernel/bpf/verifier.c +++ b/kernel/bpf/verifier.c @@@ -5876,10 -6056,22 +6060,23 @@@ static int

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

Stephen Rothwell [s...@canb.auug.org.au] wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > drivers/net/ethernet/ibm/ibmvnic.c > drivers/net/ethernet/ibm/ibmvnic.h > > between commit: > > 4a41c421f367 ("ibmvnic: serialize access to work queue on

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

On Mon, 2021-02-15 at 11:52 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > >   drivers/net/ethernet/mellanox/mlx5/core/en_main.c >   drivers/net/ethernet/mellanox/mlx5/core/en_rx.c > > between commit: > >   e4484d9df500

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

Hi Davide, On Mon, 15 Feb 2021 12:35:37 +0100 Davide Caratti wrote: > > On Mon, 2021-02-15 at 12:01 +0100, Guillaume Nault wrote: > > Before these commits, ALL_TESTS listed the tests in the order they were > > implemented in the rest of the file. So I'd rather continue following > > this

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

On Mon, 2021-02-15 at 12:01 +0100, Guillaume Nault wrote: > Before these commits, ALL_TESTS listed the tests in the order they were > implemented in the rest of the file. So I'd rather continue following > this implicit rule, if at all possible. Also it makes sense to keep > grouping all

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

On Mon, Feb 15, 2021 at 11:43:54AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > tools/testing/selftests/net/forwarding/tc_flower.sh > > between commit: > > d2126838050c ("flow_dissector: fix TTL and TOS dissection on IPv4

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

On 12/1/20 7:20 PM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/ibm/ibmvnic.c between commit: b71ec9522346 ("ibmvnic: Ensure that SCRQ entry reads are correctly ordered") from the net tree and commit:

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

On 2020-11-03 18:43, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: drivers/net/ethernet/ibm/ibmvnic.c between commit: 1d8504937478 ("powerpc/vnic: Extend "failover pending" window") from the net tree and commit: 16b5f5ce351f

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

Hi Stephen, On Fri, Oct 2, 2020 at 5:02 AM Stephen Rothwell wrote: > Today's linux-next merge of the net-next tree got a conflict in: > > Documentation/devicetree/bindings/net/renesas,ravb.txt > > between commit: > > 307eea32b202 ("dt-bindings: net: renesas,ravb: Add support for r8a774e1 >

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

On Thu, 1 Oct 2020, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/mptcp/protocol.h between commit: 1a49b2c2a501 ("mptcp: Handle incoming 32-bit DATA_FIN values") from the net tree and commit: 5c8c1640956e ("mptcp: add

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

On Thu, 1 Oct 2020, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/mptcp/protocol.c between commit: 917944da3bfc ("mptcp: Consistently use READ_ONCE/WRITE_ONCE with msk->ack_seq") from the net tree and commit: 8268ed4c9d19

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

> From: Stephen Rothwell > Date: Mon, 28 Sep 2020 12:42:10 +1000 > Subject: [PATCH] merge fix for "mdio: fix mdio-thunder.c dependency & build > error" > > Signed-off-by: Stephen Rothwell > --- > drivers/net/mdio/Kconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git

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

On Fri, 11 Sep 2020 at 02:17, Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/dsa/microchip/ksz9477.c > > between commit: > > edecfa98f602 ("net: dsa: microchip: look for phy-mode in port nodes") > > from the net tree

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

>-Original Message- >From: Stephen Rothwell >Sent: Friday, July 24, 2020 5:24 AM [...] >Subject: linux-next: manual merge of the net-next tree with the net tree > >Hi all, > >Today's linux-next merge of the net-next tree got a conflict in: > >

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

On 2020/5/13 0:47, Jakub Kicinski wrote: On Tue, 12 May 2020 13:30:51 +1000 Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got conflicts in: drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c drivers/net/ethernet/huawei/hinic/hinic_main.c between commit:

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

On Tue, 12 May 2020 13:30:51 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c > drivers/net/ethernet/huawei/hinic/hinic_main.c > > between commit: > > e8a1b0efd632 ("hinic:

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

On Fri, May 01, 2020 at 12:48:36PM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/steering/dr_send.c > > between commit: > > 8075411d93b6 ("net/mlx5: DR, On creation set CQ's arm_db

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

On Fri, 2019-09-13 at 02:25 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c > > between commit: > > 5c129241e2de ("ixgbe: add support for AF_XDP need_wakeup feature") > > from

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

On 26.08.2019 04:27, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/realtek/r8169_main.c > > between commit: > > 345b93265b3a ("Revert "r8169: remove not needed call to > dma_sync_single_for_device"") > >

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

From: Stephen Rothwell Date: Tue, 9 Jul 2019 10:27:28 +1000 > I am still getting this conflict (the commit ids may have changed). > Just a reminder in case you think Linus may need to know. I'm resolving this right now, thanks Stephen.

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

Hi all, On Tue, 2 Jul 2019 12:13:57 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv4/devinet.c > > between commit: > > 2e6054636816 ("ipv4: don't set IPv6 only flags to IPv4 addresses") > > from the net tree and commit: > >

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

Merge fix looks like correct. Might be my fault I sent dp83867 patches against linux.git, not linux-next.git. If you want I can resend updated version for linux-next. Max. чт, 30 мая 2019 г. в 02:56, Stephen Rothwell : > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict

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

On Mon, 2019-04-01 at 09:11 +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en/port_buffer.c > > between commit: > > e28408e98bce ("net/mlx5e: Update xon formula") > > from the net

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

Hi all, On Wed, 13 Feb 2019 11:13:25 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_tcindex.c > > between commits: > > 8015d93ebd27 ("net_sched: fix a race condition in tcindex_destroy()") > 033b228e7f26 ("net_sched:

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

Hi Stephen, On Thu, Feb 07, 2019 at 11:54:24AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > > between commit: > > 1651925d403e ("net/mlx5e: Use the inner headers to

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

On Thu, Dec 20, 2018 at 4:47 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_rep.c > > between commit: > > 8956f0014ea5 ("net/mlx5e: Fix default amount of channels for VF >

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

Hi, On Tue, 18 Dec 2018 00:01:57 +0200 Or Gerlitz wrote: > > Just a note, > > e88afe759a49 ("net/mlx5e: Err if asked to mirror a goto chain tc eswitch > rule") > > is from net and not net-next Yeah, my mistake ... -- Cheers, Stephen Rothwell pgpYqakizo_6s.pgp Description: OpenPGP

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

On Mon, Dec 17, 2018 at 11:29 PM Saeed Mahameed wrote: > On Sun, Dec 16, 2018 at 4:25 PM Stephen Rothwell > wrote: > > I fixed it up (see below) and can carry the fix as necessary. This > Looks good to me. here too > > Today's linux-next merge of the net-next tree got a conflict in: > >

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

On Sun, Dec 16, 2018 at 4:25 PM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_tc.c > > between commit: > > 154e62abe9cd ("net/mlx5e: Properly initialize flow attributes for slow path >

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

On Mon, Dec 17, 2018 at 2:03 AM Ido Schimmel wrote: > > On Mon, Dec 17, 2018 at 11:31:06AM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Today's linux-next merge of the net-next tree got a conflict in: > > > > net/ipv6/ip6_output.c > > > > between commit: > > > > 8203e2d844d3 ("net:

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

On Mon, Dec 17, 2018 at 11:31:06AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv6/ip6_output.c > > between commit: > > 8203e2d844d3 ("net: clear skb->tstamp in forwarding paths") > > from the net tree and commit:

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

On 12/9/2018 5:36 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_flower.c > > between commit: > > 35cc3cefc4de ("net/sched: cls_flower: Reject duplicated rules also under > skip_sw") > > from the net tree and

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

On Mon, Dec 10, 2018 at 3:38 AM Stephen Rothwell wrote: > > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_flower.c > > between commit: > > 35cc3cefc4de ("net/sched: cls_flower: Reject duplicated rules also under > skip_sw") > > from the net

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

On 2018-10-08 9:21 p.m., Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/cls_u32.c between commit: 6d4c407744dd ("net: sched: cls_u32: fix hnode refcounting") from the net tree and commit: a030598690c6 ("net: sched:

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

On 2018-10-08 9:21 p.m., Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/cls_u32.c between commit: 6d4c407744dd ("net: sched: cls_u32: fix hnode refcounting") from the net tree and commit: a030598690c6 ("net: sched:

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

On 09/18/2018 02:11 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > tools/testing/selftests/net/tls.c > > between commit: > > 50c6b58a814d ("tls: fix currently broken MSG_PEEK behavior") > > from the net tree and commit: > >

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

On 09/18/2018 02:11 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > tools/testing/selftests/net/tls.c > > between commit: > > 50c6b58a814d ("tls: fix currently broken MSG_PEEK behavior") > > from the net tree and commit: > >

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

Hi Anders, On Wed, 9 May 2018 10:24:49 +0200 Anders Roxell wrote: > > On 9 May 2018 at 06:19, Stephen Rothwell wrote: > > > > TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh > > rtnetlink.sh > > - TEST_PROGS +=

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

Hi Anders, On Wed, 9 May 2018 10:24:49 +0200 Anders Roxell wrote: > > On 9 May 2018 at 06:19, Stephen Rothwell wrote: > > > > TEST_PROGS := run_netsocktests run_afpackettests test_bpf.sh netdevice.sh > > rtnetlink.sh > > - TEST_PROGS += fib_tests.sh fib-onlink-tests.sh pmtu.sh > > +

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

On 9 May 2018 at 06:19, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > tools/testing/selftests/net/Makefile > > between commit: > > 1751eb42ddb5 ("selftests: net: use TEST_PROGS_EXTENDED") > > from the net tree

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

On 9 May 2018 at 06:19, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > tools/testing/selftests/net/Makefile > > between commit: > > 1751eb42ddb5 ("selftests: net: use TEST_PROGS_EXTENDED") > > from the net tree and commits: > >

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

Stephen Rothwell writes: > Today's linux-next merge of the net-next tree got conflicts in: > > drivers/net/ethernet/mellanox/mlxsw/spectrum.h > drivers/net/ethernet/mellanox/mlxsw/spectrum.c > > between commit: > > 663f1b26f9c1 ("mlxsw: spectrum: Prevent duplicate

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

Stephen Rothwell writes: > Today's linux-next merge of the net-next tree got conflicts in: > > drivers/net/ethernet/mellanox/mlxsw/spectrum.h > drivers/net/ethernet/mellanox/mlxsw/spectrum.c > > between commit: > > 663f1b26f9c1 ("mlxsw: spectrum: Prevent duplicate mirrors") > > from the

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

Stephen Rothwell writes: > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv4/ip_tunnel.c > > between commit: > > 4e994776e7bd ("ip_tunnel: Do not use mark in skb by default") > > from the net tree and commit: > > b0066da52ea5 ("ip_tunnel:

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

Stephen Rothwell writes: > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv4/ip_tunnel.c > > between commit: > > 4e994776e7bd ("ip_tunnel: Do not use mark in skb by default") > > from the net tree and commit: > > b0066da52ea5 ("ip_tunnel: Rename & publish

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

On Mon, Jan 15, 2018 at 1:52 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > include/linux/mlx5/mlx5_ifc.h > > between commit: > > 8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast >

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

On Mon, Jan 15, 2018 at 1:52 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > include/linux/mlx5/mlx5_ifc.h > > between commit: > > 8978cc921fc7 ("{net,ib}/mlx5: Don't disable local loopback multicast > traffic when needed") > >

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

On Tue, Oct 31, 2017 at 5:58 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_api.c > > between commit: > > 822e86d997e4 ("net_sched: remove tcf_block_put_deferred()") > > from the net tree and

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

On Tue, Oct 31, 2017 at 5:58 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_api.c > > between commit: > > 822e86d997e4 ("net_sched: remove tcf_block_put_deferred()") > > from the net tree and commit: > >

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

On 10/19/2017 03:05 PM, Mark Brown wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: tools/testing/selftests/bpf/test_verifier.c between commit: 28e33f9d78eef ("bpf: disallow arithmetic operations on context pointer") from the net tree and commit:

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

On 10/19/2017 03:05 PM, Mark Brown wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: tools/testing/selftests/bpf/test_verifier.c between commit: 28e33f9d78eef ("bpf: disallow arithmetic operations on context pointer") from the net tree and commit:

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

On Tue, Oct 17, 2017 at 02:30:29PM +0300, Sergei Shtylyov wrote: > > diff --cc drivers/net/dsa/mv88e6060.c > > index f123ed57630d,6173be889d95.. > > --- a/drivers/net/dsa/mv88e6060.c > > +++ b/drivers/net/dsa/mv88e6060.c >Your mail ends here. Yes, that's the resulting diff.

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

On Tue, Oct 17, 2017 at 02:30:29PM +0300, Sergei Shtylyov wrote: > > diff --cc drivers/net/dsa/mv88e6060.c > > index f123ed57630d,6173be889d95.. > > --- a/drivers/net/dsa/mv88e6060.c > > +++ b/drivers/net/dsa/mv88e6060.c >Your mail ends here. Yes, that's the resulting diff.

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

Hello! On 10/16/2017 12:36 PM, Mark Brown wrote: Today's linux-next merge of the net-next tree got a conflict in: drivers/net/dsa/mv88e6060.c between commit: 3efc93c2bc243 ("net: dsa: mv88e6060: fix switch MAC address") from the net tree and commit: 56c3ff9bf23e1 ("net: dsa:

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

Hello! On 10/16/2017 12:36 PM, Mark Brown wrote: Today's linux-next merge of the net-next tree got a conflict in: drivers/net/dsa/mv88e6060.c between commit: 3efc93c2bc243 ("net: dsa: mv88e6060: fix switch MAC address") from the net tree and commit: 56c3ff9bf23e1 ("net: dsa:

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

On Wed, Aug 23, 2017 at 11:31:05AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv6/ip6_fib.c > > between commit: > > c5cff8561d2d ("ipv6: add rcu grace period before freeing fib6_node") > > from the net tree and

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

On Wed, Aug 23, 2017 at 11:31:05AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv6/ip6_fib.c > > between commit: > > c5cff8561d2d ("ipv6: add rcu grace period before freeing fib6_node") > > from the net tree and

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

Hi Neal, On Sun, 6 Aug 2017 22:21:43 -0400 Neal Cardwell wrote: > > > I fixed it up (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

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

Hi Neal, On Sun, 6 Aug 2017 22:21:43 -0400 Neal Cardwell wrote: > > > I fixed it up (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 tree > > is

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

On Sun, Aug 6, 2017 at 10:01 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv4/tcp_output.c > > between commit: > > a2815817ffa6 ("tcp: enable xmit timer fix by having TLP use time when RTO > should

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

On Sun, Aug 6, 2017 at 10:01 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/ipv4/tcp_output.c > > between commit: > > a2815817ffa6 ("tcp: enable xmit timer fix by having TLP use time when RTO > should fire") > > from the net

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

On Thu, 3 Aug 2017 12:01:37 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/hyperv/netvsc.c > > between commit: > > 4a0dee1ffe0e ("netvsc: Initialize 64-bit stats seqcount") > > from the

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

On Thu, 3 Aug 2017 12:01:37 +1000 Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/hyperv/netvsc.c > > between commit: > > 4a0dee1ffe0e ("netvsc: Initialize 64-bit stats seqcount") > > from the net tree and commit: >

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

On Mon, Jul 3, 2017 at 4:43 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > drivers/net/ethernet/mellanox/mlx5/core/health.c > include/linux/mlx5/driver.h > > between commit: > > 2a0165a034ac ("net/mlx5:

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

On Mon, Jul 3, 2017 at 4:43 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > drivers/net/ethernet/mellanox/mlx5/core/health.c > include/linux/mlx5/driver.h > > between commit: > > 2a0165a034ac ("net/mlx5: Cancel delayed recovery

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

On 04/18/2017 02:18 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: kernel/bpf/syscall.c between commits: 6b1bb01bcc5b ("bpf: fix cb access in socket filter programs on tail calls") c2002f983767 ("bpf: fix checking xdp_adjust_head

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

On 04/18/2017 02:18 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: kernel/bpf/syscall.c between commits: 6b1bb01bcc5b ("bpf: fix cb access in socket filter programs on tail calls") c2002f983767 ("bpf: fix checking xdp_adjust_head

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

On Thu, Apr 6, 2017 at 5:12 PM, Stephen Rothwell wrote: > 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,8 +794,8 @@@ static void attach_default_qdiscs(struc

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

On Thu, Apr 6, 2017 at 5:12 PM, Stephen Rothwell wrote: > 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,8 +794,8 @@@ static void attach_default_qdiscs(struc > } >

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

On Tue, Apr 04, 2017 at 11:13:57AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/core/flow_dissector.c > > between commit: > > ac6a3722fed6 ("flow dissector: correct size of storage for ARP") > > from the net tree and

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

On Tue, Apr 04, 2017 at 11:13:57AM +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/core/flow_dissector.c > > between commit: > > ac6a3722fed6 ("flow dissector: correct size of storage for ARP") > > from the net tree and

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

On 04/03/2017 04:07 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got conflicts in: tools/testing/selftests/bpf/Makefile tools/testing/selftests/bpf/test_verifier.c between commit: 02ea80b1850e ("bpf: add various verifier test cases for

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

On 04/03/2017 04:07 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got conflicts in: tools/testing/selftests/bpf/Makefile tools/testing/selftests/bpf/test_verifier.c between commit: 02ea80b1850e ("bpf: add various verifier test cases for

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

Thu, Dec 01, 2016 at 02:41:59AM CET, s...@canb.auug.org.au wrote: >Hi all, > >Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_flower.c > >between commit: > > 725cbb62e7ad ("sched: cls_flower: remove from hashtable only in case skip sw > flag is not set") >

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

Thu, Dec 01, 2016 at 02:41:59AM CET, s...@canb.auug.org.au wrote: >Hi all, > >Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/cls_flower.c > >between commit: > > 725cbb62e7ad ("sched: cls_flower: remove from hashtable only in case skip sw > flag is not set") >

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

On Tue, Nov 29, 2016 at 11:22:32AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/amd/xgbe/xgbe-main.c > > between commit: > > 91eefaabf102 ("amd-xgbe: Fix unused suspend handlers build warning") > >

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

On Tue, Nov 29, 2016 at 11:22:32AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/amd/xgbe/xgbe-main.c > > between commit: > > 91eefaabf102 ("amd-xgbe: Fix unused suspend handlers build warning") > >

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

On 11/29/2016 01:31 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/cls_flower.c between commit: d936377414fa ("net, sched: respect rcu grace period on cls destruction") from the net tree and commit: 13fa876ebd03

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

On 11/29/2016 01:31 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: net/sched/cls_flower.c between commit: d936377414fa ("net, sched: respect rcu grace period on cls destruction") from the net tree and commit: 13fa876ebd03

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

On Thu, Nov 10, 2016 at 1:50 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c > > between commit: > ee39fbc4447d ("net/mlx5: E-Switch, Set the

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

On Thu, Nov 10, 2016 at 1:50 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/eswitch_offloads.c > > between commit: > ee39fbc4447d ("net/mlx5: E-Switch, Set the actions for offloaded rules

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

On Mon, Nov 7, 2016 at 5:25 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/netlink/genetlink.c > > between commit: > > 00ffc1ba02d8 ("genetlink: fix a memory leak on error path") > > from the net tree

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

On Mon, Nov 7, 2016 at 5:25 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/netlink/genetlink.c > > between commit: > > 00ffc1ba02d8 ("genetlink: fix a memory leak on error path") > > from the net tree and commit: > >

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

On Thu, Oct 20, 2016 at 11:01:42AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > include/linux/netdevice.h > net/core/dev.c > > between commit: > > e4961b076885 ("net: core: Correctly iterate over lower adjacency list") >

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

On Thu, Oct 20, 2016 at 11:01:42AM +1100, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got conflicts in: > > include/linux/netdevice.h > net/core/dev.c > > between commit: > > e4961b076885 ("net: core: Correctly iterate over lower adjacency list") >

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

On 08/15/2016 02:35 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: kernel/bpf/verifier.c between commit: 747ea55e4f78 ("bpf: fix bpf_skb_in_cgroup helper naming") from the net tree and commit: 60d20f9195b2 ("bpf: Add

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

On 08/15/2016 02:35 AM, Stephen Rothwell wrote: Hi all, Today's linux-next merge of the net-next tree got a conflict in: kernel/bpf/verifier.c between commit: 747ea55e4f78 ("bpf: fix bpf_skb_in_cgroup helper naming") from the net tree and commit: 60d20f9195b2 ("bpf: Add

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

On Mon, Jul 4, 2016 at 6:07 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_main.c > > between commit: > > 29429f3300a3 ("net/mlx5e: Timeout if SQ doesn't flush

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

On Mon, Jul 4, 2016 at 6:07 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_main.c > > between commit: > > 29429f3300a3 ("net/mlx5e: Timeout if SQ doesn't flush during close") > > from

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

On Mon, Jul 4, 2016 at 6:02 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en.h > > between commit: > > 6cd392a082de ("net/mlx5e: Handle RQ flush in error cases") > >

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

On Mon, Jul 4, 2016 at 6:02 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en.h > > between commit: > > 6cd392a082de ("net/mlx5e: Handle RQ flush in error cases") > > from the net tree and

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

On Mon, 2016-06-27 at 11:46 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/sch_netem.c > > between commit: > > 21de12ee5568 ("netem: fix a use after free") > > from the net tree and commit: > > 520ac30f4551

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

On Mon, 2016-06-27 at 11:46 +1000, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > net/sched/sch_netem.c > > between commit: > > 21de12ee5568 ("netem: fix a use after free") > > from the net tree and commit: > > 520ac30f4551

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

On Wed, Apr 27, 2016 at 5:01 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_main.c > > between commit: > > d8edd2469ace ("et/mlx5e: Fix minimum MTU") > > from the

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

On Wed, Apr 27, 2016 at 5:01 AM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the net-next tree got a conflict in: > > drivers/net/ethernet/mellanox/mlx5/core/en_main.c > > between commit: > > d8edd2469ace ("et/mlx5e: Fix minimum MTU") > > from the net tree and commit: >

  1   2   >