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
>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:
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: stmmac: Enable RX
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/tipc/crypto.c
between commit:
2a2403ca3add ("tipc: increment the tmp aead refcnt before attaching it")
from the net tree and commit:
97bc84bbd4de ("tipc: clean up warnings detected by sparse")
from the
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/ethtool.h
between commit:
a975d7d8a356 ("ethtool: Remove link_mode param and derive link params from
driver")
from the net tree and commit:
7888fe53b706 ("ethtool: Add common function for filling
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:
3ff3874fa0b2 ("net/mlx5e: Guarantee room for XSK wakeup NOP on async ICOSQ")
from the net tree and commits:
c276aae8c19d ("net/mlx5: Move mlx5e hw
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c
between commit:
7c1ef1959b6f ("net/mlx5: SF, do not use ecpu bit for vhca state processing")
from the net tree and commit:
4c94fe88cde4 ("net: ethernet: Remove
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:
7d6c86e3ccb5 ("net/mlx5e: Allow to match on MPLS parameters only for MPLS
over UDP")
from the net tree and commit:
a3222a2da0a2 ("net/mlx5e: Allow
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
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
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
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
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/verifier.c
between commits:
b5871dca250c ("bpf: Simplify alu_limit masking for pointer arithmetic")
1b1597e64e1a ("bpf: Add sanity check for upper ptr_limit")
from the net tree and commit:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/pensando/ionic/ionic_txrx.c
between commit:
d2c21422323b ("ionic: linearize tso skb with too many frags")
from the net tree and commit:
f37bc3462e80 ("ionic: optimize fastpath struct usage")
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
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 remove")
from the net tree and commits:
bab08bedcdc3 ("ibmvnic: fix
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
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
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
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
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 ("net/mlx5e: Enable striding RQ for Connect-X IPsec capable
devices")
from the net tree
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 fragments")
from the net tree and commits:
203ee5cd7235 ("selftests: tc: Add
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/uapi/linux/pkt_cls.h
between commit:
1bcc51ac0731 ("net/sched: cls_flower: Reject invalid ct_state flags rules")
from the net tree and commits:
7baf2429a1a9 ("net/sched: cls_flower add CT_FLAGS_INVALID
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/can/m_can/tcan4x5x-core.c
between commit:
aee2b3ccc8a6 ("can: tcan4x5x: fix bittiming const, use common bittiming from
m_can driver")
from the net tree and commit:
7813887ea972 ("can: tcan4x5x: rename
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:
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:
ec20f36bb41a ("ibmvnic: Correctly re-enable interrupts
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/ibm/ibmvnic.c
between commit:
9281cf2d5840 ("ibmvnic: avoid memset null scrq msgs")
from the net tree and commit:
f019fb6392e5 ("ibmvnic: Introduce indirect subordinate Command Response Queue
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
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 ("ibmvnic: merge do_change_param_reset into do_reset")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/mptcp/protocol.h
between commit:
d582484726c4 ("mptcp: fix fallback for MP_JOIN subflows")
from the net tree and commit:
d0876b2284cf ("mptcp: add the incoming RM_ADDR support")
from the net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/rxrpc/conn_event.c
between commit:
fa1d113a0f96 ("rxrpc: Fix some missing _bh annotations on locking
conn->state_lock")
from the net tree and commit:
245500d853e9 ("rxrpc: Rewrite the client connection
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
>
Hi all,
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 SoC")
from the net tree and commit:
d7adf6331189 ("dt-bindings: net:
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
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
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 mptcp_destroy_common helper")
from the net-next tree.
I
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 ("mptcp: introduce and use mptcp_try_coalesce()")
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/realtek.c
between commit:
bbc4d71d6354 ("net: phy: realtek: fix rtl8211e rx/tx delay config")
from the net tree and commit:
66e22932eb79 ("net: phy: realtek: enable ALDPS to save power for
> 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
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/Kconfig
between commit:
7dbbcf496f2a ("mdio: fix mdio-thunder.c dependency & build error")
from the net tree and commit:
a9770eac511a ("net: mdio: Move MDIO drivers into a new subdirectory")
from
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/route.c
between commit:
2fbc6e89b2f1 ("ipv4: Update exception handling for multipath routes via same
device")
from the net tree and commit:
8b4510d76cde ("net: gain ipv4 mtu when mtu is not locked")
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
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 and commit:
805a7e6f5388 ("net: dsa: microchip: Improve phy mode
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/raw.c
between commit:
645f08975f49 ("net: Fix some comments")
from the net tree and commit:
2bdcc73c88d2 ("net: ipv4: delete repeated words")
from the net-next tree.
I fixed it up (they each removed a
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/ibm/ibmvnic.c
between commit:
9f1345737790 ("ibmvnic fix NULL tx_pools and rx_tools issue at do_reset")
from the net tree and commit:
507ebe6444a4 ("ibmvnic: Fix use-after-free of VNIC login
>-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:
>
> driver
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/geneve.c
between commit:
32818c075c54 ("geneve: fix an uninitialized value in geneve_changelink()")
from the net tree and commit:
9e06e8596bc8 ("geneve: move all configuration under struct
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/freescale/enetc/enetc_pf.c
between commit:
26cb7085c898 ("enetc: Remove the mdio bus on PF probe bailout")
from the net tree and commits:
07095c025ac2 ("net: enetc: Use DT protocol information
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/netdevsim/netdev.c
between commit:
2c9d8e01f0c6 ("netdevsim: fix unbalaced locking in nsim_create()")
from the net tree and commit:
424be63ad831 ("netdevsim: add UDP tunnel port offload support")
from
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/aquantia/atlantic/aq_hw.h
between commit:
23e500e88723 ("net: atlantic: disable PTP on AQC111, AQC112")
from the net tree and commit:
1e41b3fee795 ("net: atlantic: add support for 64-bit
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/xfrm/xfrm_device.c
between commit:
94579ac3f6d0 ("xfrm: Fix double ESP trailer insertion in IPsec crypto
offload.")
from the net tree and commit:
272c2330adc9 ("xfrm: bail early on slave pass over skb")
from
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:
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:
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: fix a bug of ndo_stop")
from the net tree and commit:
7dd29ee12865 ("hinic:
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
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 member to right
value")
from the net tree and commit:
73a75b96fc9a ("net/mlx5:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/net/mptcp.h
between commit:
cfde141ea3fa ("mptcp: move option parsing into mptcp_incoming_options()")
from the net tree and commit:
071c8ed6e88d ("tcp: mptcp: use mptcp receive buffer space to select rcv
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/netdevsim/fib.c
between commit:
33902b4a4227 ("netdevsim: Fix error handling in nsim_fib_init and
nsim_fib_exit")
from the net tree and commit:
a5facc4cac4d ("netdevsim: change fib accounting and
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
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 the net tree and commit:
bf280c0387eb ("ixgbe: fix double clean of Tx
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/bluetooth/btusb.c
between commit:
1ffdb51f28e8 ("Revert "Bluetooth: btusb: driver to enable the usb-wakeup
feature"")
from the net tree and commit:
9e45524a0111 ("Bluetooth: btusb: Fix suspend issue for
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/usb/r8152.c
between commits:
49d4b14113ca ("Revert "r8152: napi hangup fix after disconnect"")
973dc6cfc0e2 ("r8152: remove calling netif_napi_del")
from the net tree and commit:
d2187f8e4454
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"")
>
>
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"")
from the net tree and commit:
fcd4e60885af ("r8169: improve rtl_rx")
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:
93b3586e070b ("net/mlx5: Support inner header match criteria for non decap
flow action")
from the net tree and commit:
226f2ca3075a ("net/mlx5e:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/can/flexcan.c
between commit:
e9f2a856e102 ("can: flexcan: fix an use-after-free in
flexcan_setup_stop_mode()")
from the net tree and commit:
915f9666421c ("can: flexcan: add support for DT property
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.
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:
>
>
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/net/config
between commit:
ff95bf28c234 ("selftests/net: skip psock_tpacket test if KALLSYMS was not
enabled")
from the net tree and commit:
af5136f95045 ("selftests/net: SO_TXTIME with
Hi all,
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:
2638eb8b50cf ("net: ipv4: provide __rcu annotation for ifa_list")
from the
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
drivers/net/ethernet/aquantia/atlantic/aq_nic.c
drivers/net/ethernet/aquantia/atlantic/aq_nic.h
between commit:
48dd73d08d4d ("net: aquantia: fix vlans not working over bridged network")
from the net tree and
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/ip_output.c
between commit:
5b18f1289808 ("ipv4: reset rt_iif for recirculated mcast/bcast out pkts")
from the net tree and commit:
956fe2190820 ("bpf: Update BPF_CGROUP_RUN_PROG_INET_EGRESS calls")
from
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/wireless/nl80211.c
between commit:
180aa422ef27 ("nl80211: fill all policy .type entries")
from the net tree and commit:
1a28ed213696 ("nl80211: fill all policy .type entries")
from the net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/vmw_vsock/hyperv_transport.c
between commit:
d424a2afd7da ("hv_sock: Suppress bogus "may be used uninitialized" warnings")
from the net tree and commit:
ac383f58f3c9 ("hv_sock: perf: Allow the socket buffer
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/verifier.c
between commit:
983695fa6765 ("bpf: fix unconnected udp hooks")
from the net tree and commit:
5cf1e9145630 ("bpf: cgroup inet skb programs can return 0 to 3")
from the net-next tree.
I
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/cmd.c
between commit:
6a6fabbfa3e8 ("net/mlx5: Update pci error handler entries and command
translation")
from the net tree and commit:
cd56f929e6a5 ("net/mlx5: E-Switch,
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/phylink.c
between commit:
c678726305b9 ("net: phylink: ensure consistent phy interface mode")
from the net tree and commit:
27755ff88c0e ("net: phylink: Add phylink_mac_link_{up, down} wrapper
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
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/phy/dp83867.c
between commits:
2b892649254f ("net: phy: dp83867: Set up RGMII TX delay")
333061b92453 ("net: phy: dp83867: fix speed 10 in sgmii mode")
from the net tree and commits:
c11669a2757e
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
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/ipv4/tcp.c
between commit:
04c03114be82 ("tcp: clear icsk_backoff in tcp_write_queue_purge()")
from the net tree and commit:
3a9a57f63794 ("tcp: move snd_cwnd & snd_cwnd_cnt init to tcp_disconnect()")
from
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:
Hi all,
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: fix a memory leak in cls_tcindex")
from the net tree and commit:
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
net/ipv4/netfilter/nf_nat_l3proto_ipv4.c
net/ipv6/netfilter/nf_nat_l3proto_ipv6.c
between commit:
8303b7e8f018 ("netfilter: nat: fix spurious connection timeouts")
from the net tree and commit:
303e0c558959
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:
218d05ce326f ("net/mlx5e: Don't overwrite pedit action when multiple pedit
used")
from the net tree and commit:
c500c86b0c75 ("net/mlx5e: support
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
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 determine tc/pedit offload
limitation on decap flows")
from the net tree and commit:
738678817573
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
Documentation/networking/snmp_counter.rst
between commit:
a6c7c7aac2de ("net: add document for several snmp counters")
from the net tree and commit:
ae5220c67218 ("networking: Documentation: fix snmp_counters.rst
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
>
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 representors")
from the net tree and commit:
d9ee0491c2ff ("net/mlx5e: Use dedicated
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
tools/testing/selftests/net/Makefile
between commit:
55cbe0794294 ("selftests: net: Add test_vxlan_fdb_changelink.sh")
from the net tree and commit:
e87f53b4fab7 ("selftests: add some benchmark for UDP GRO")
(
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/vxlan.c
between commits:
6db924687139 ("vxlan: Fix error path in __vxlan_dev_create()")
ce5e098f7a10 ("vxlan: changelink: Fix handling of default remotes")
from the net tree and commit:
0e6160f3f5a9
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
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:
> >
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
>
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:
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:
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:
f839a6c92504 ("net: Do not route unicast IP packets twice")
from the net-next tree.
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
eswitch rule deletion")
from the net tree and commit:
e88afe759a49
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/crypto/chelsio/chtls/chtls_cm.c
between commit:
0c3a16be700e ("crypto/chelsio/chtls: send/recv window update")
from the net tree and commit:
02d805dc5fe3 ("cxgb4: use new fw interface to get the VIN and
1 - 100 of 638 matches
Mail list logo
