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 index
>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: stmm
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
On Wed, Apr 7, 2021 at 8:11 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/core/skmsg.c
>
> between commit:
>
> 144748eb0c44 ("bpf, sockmap: Fix incorrect fwd_alloc accounting")
>
> from the bpf tree and commit:
>
> e3526bb
On Wed, Apr 7, 2021 at 8:02 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> include/linux/skmsg.h
>
> between commit:
>
> 1c84b33101c8 ("bpf, sockmap: Fix sk->prot unhash op reset")
>
> from the bpf tree and commit:
>
> 8a59f9d1
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 net-nex
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/core/skmsg.c
between commit:
144748eb0c44 ("bpf, sockmap: Fix incorrect fwd_alloc accounting")
from the bpf tree and commit:
e3526bb92a20 ("skmsg: Move sk_redir from TCP_SKB_CB to skb")
from the net-next tree.
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/skmsg.h
between commit:
1c84b33101c8 ("bpf, sockmap: Fix sk->prot unhash op reset")
from the bpf tree and commit:
8a59f9d1e3d4 ("sock: Introduce sk->sk_prot->psock_update_sk_prot()")
from the net-nex
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 out
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 r
On Mon, Mar 29, 2021 at 12:29:16PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> include/linux/bpf.h
>
> between commit:
>
> 861de02e5f3f ("bpf: Take module reference for trampoline in module")
>
> from the bpf tree and co
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/linux/bpf.h
between commit:
861de02e5f3f ("bpf: Take module reference for trampoline in module")
from the bpf tree and commit:
69c087ba6225 ("bpf: Add bpf_for_each_map_elem() helper")
from the net-next tre
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 to
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
index
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 44e4
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 retr
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:
69c087ba6225
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")
f
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 remov
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 b
Hi Stephen,
> From: Stephen Rothwell, Sent: Wednesday, February 17, 2021 6:18 AM
> On Tue, 16 Feb 2021 11:53:56 + Yoshihiro Shimoda
> wrote:
> >
> > > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
> >
> > > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > >
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 ("net/mlx5e
Hi Yoshihiro,
On Tue, 16 Feb 2021 11:53:56 + Yoshihiro Shimoda
wrote:
>
> > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
>
> > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > index 2407b2d89c1e,48fa8776e36f..
> > --- a/arch/arm64/boot/dts/to
hiro Shimoda
> ; Stephen
> Rothwell
> Cc: David Miller ; Networking ;
> Olof Johansson ; Arnd
> Bergmann ; ARM ; Bartosz
> Golaszewski
> ; Linux Next Mailing List
> ; Linux Kernel Mailing List
> ; lkft-tri...@lists.linaro.org
> Subject: RE: linux-next: manual merge of
Hi,
Thnaks for your report.
> LKFT builders also found this problem while building arm64 dtb.
>
> > This ` causes the following build error on the next-20210216.
> >
> > DTC arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dtb
> > Error: arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts:52.3-4
On Tue, 16 Feb 2021 at 17:26, Yoshihiro Shimoda
wrote:
>
> Hi,
>
> > From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
>
> > diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> > index 2407b2d89c1e,48fa8776e36f..
> > --- a/arch/arm64/boot/dts/toshiba/tmpv7708-
Hi,
> From: Stephen Rothwell, Sent: Tuesday, February 16, 2021 11:05 AM
> diff --cc arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> index 2407b2d89c1e,48fa8776e36f..
> --- a/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
> +++ b/arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
>
On Tue, Feb 16, 2021 at 3:20 AM 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 submitted for merging. You
inux
> Next Mailing List ; iwamatsu nobuhiro(岩松 信洋
> □ＳＷＣ◯ＡＣＴ)
>
> Subject: linux-next: manual merge of the net-next tree with the arm-soc tree
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/arm64/boot/dts/toshiba/tm
Hi all,
Today's linux-next merge of the net-next tree got conflicts in:
arch/arm64/boot/dts/toshiba/tmpv7708-rm-mbrc.dts
arch/arm64/boot/dts/toshiba/tmpv7708.dtsi
between commits:
4fd18fc38757 ("arm64: dts: visconti: Add watchdog support for TMPV7708 SoC")
0109a17564fc ("arm: dts: visco
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 implicit
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 match_ip_*
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 bas
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 flag
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/can/dev.c
between commit:
b552766c872f ("can: dev: prevent potential information leak in
can_fill_info()")
from Linus' tree and commits:
3e77f70e7345 ("can: dev: move driver related infrastructure into
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/switchdev/switchdev.c
between commit:
20776b465c0c ("net: switchdev: don't set port_obj_info->handled true when
-EOPNOTSUPP")
from Linus' tree and commits:
ffb68fc58e96 ("net: switchdev: remove the transaction
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c
between commit:
57ac4a31c483 ("net/mlx5e: Correctly handle changing the number of queues when
the interface is down")
from Linus' tree and commit:
214baf22870c
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
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/netfilter/nf_tables_api.c
between commit:
42f1c2712090 ("netfilter: nftables: comment indirect serialization of
commit_mutex with rtnl_mutex")
from the netfilter tree and commit:
872f69034194 ("treewide: renam
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:
ec20f36
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 i
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 ("ibmvnic
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 fixe
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 manager
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
> S
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: re
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 mptcp_destro
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 ("mptcp:
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()")
a
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 RTL8211F"
> 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 a/drivers/net/mdi
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 t
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")
from
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 and
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 message")
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 di
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 re
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
lib/nlattr.c
between commit:
58e813cceabd ("treewide: Use fallthrough pseudo-keyword")
from the kspp-gustavo tree and commit:
8aa26c575fb3 ("netlink: make NLA_BINARY validation more flexible")
from the net-next tr
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
lib/Kconfig
between commit:
1a479f783857 ("lib: Add a generic version of devmem_is_allowed()")
from the risc-v tree and commit:
b8265621f488 ("Add pldmfw library for PLDM firmware update")
from the net-next 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:
>
> d
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 geneve_config
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 reads/
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
kernel/bpf/btf.c
between commit:
5b801dfb7feb ("bpf: Fix NULL pointer dereference in
__btf_resolve_helper_id()")
from the bpf tree and commit:
138b9a0511c7 ("bpf: Remove btf_id helpers resolving")
from the net-ne
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
Hi all,
On Fri, 29 May 2020 13:19:55 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/sunrpc/svcsock.c
>
> between commits:
>
> 11bbb0f76e99 ("SUNRPC: Trace a few more generic svc_xprt events")
> 998024dee197 ("SUNRPC: Add more s
Hi all,
On Tue, 2 Jun 2020 12:09:57 +1000 Stephen Rothwell
wrote:
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt
>
> between commit:
>
> 7b9e111a5216 ("dt-bindings: clock: mediatek:
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
Documentation/devicetree/bindings/arm/mediatek/mediatek,pericfg.txt
between commit:
7b9e111a5216 ("dt-bindings: clock: mediatek: document clk bindings for
Mediatek MT6765 SoC")
from the clk tree and commit:
9f9d1e
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/sunrpc/svcsock.c
between commits:
11bbb0f76e99 ("SUNRPC: Trace a few more generic svc_xprt events")
998024dee197 ("SUNRPC: Add more svcsock tracepoints")
from the nfsd tree and commits:
9b115749acb2 ("ipv6: a
On 2020-05-26 05:12, Stephen Rothwell 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 submitted for merging. You may also want
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
net/xdp/xdp_umem.c
between commit:
b16a87d0aef7 ("xsk: Add overflow check for u64 division, stored into u32")
from the bpf tree and commit:
2b43470add8c ("xsk: Introduce AF_XDP buffer allocation API")
from the net
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: fix
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: ad
On Fri, 2020-05-08 at 09:35 -0300, Jason Gunthorpe wrote:
> On Fri, May 08, 2020 at 01:18:51PM +1000, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in:
> >
> > drivers/net/bonding/bond_main.c
> >
> > between commits:
> >
> > ed7d4f0
On Fri, 2020-05-08 at 13:18 +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/bonding/bond_main.c
>
> between commits:
>
> ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves")
> c071d91d2a89 ("bonding: Add
On Fri, May 08, 2020 at 01:18:51PM +1000, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/net/bonding/bond_main.c
>
> between commits:
>
> ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves")
> c071d91d2a89 ("bondin
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/bonding/bond_main.c
between commits:
ed7d4f023b1a ("bonding: Rename slave_arr to usable_slaves")
c071d91d2a89 ("bonding: Add helper function to get the xmit slave based on
hash")
29d5bbccb3a1 ("bonding
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 member
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/mellanox/mlxsw/spectrum_span.c
between commit:
3ba225b506a2 ("treewide: Replace zero-length array with flexible-array
member")
from the kspp-gustavo tree and commit:
4780dbdbd957 ("mlxsw: spec
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: Re
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
w
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
include/net/net_namespace.h
between commit:
2a06b8982f8f ("net: reorder 'struct net' fields to avoid false sharing")
from Linus' tree and commit:
a30c7b429f2d ("net: introduce per-netns netdevice notifiers")
from
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 limit
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:
bf280c0387ebbf8ee ("ixgbe: fix double clean of Tx descriptors with xdp")
from Linus' tree and commit:
5c129241e2de79f09 ("ixgbe: add support for AF_XDP n
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/bluetooth/btusb.c
between commit:
1ffdb51f28e8ec ("Revert "Bluetooth: btusb: driver to enable the usb-wakeup
feature"")
from Linus' tree and commit:
9e45524a011107 ("Bluetooth: btusb: Fix suspend issue for
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 the
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 descriptors
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 Re
Hi all,
Today's linux-next merge of the net-next tree got a conflict in:
drivers/net/ethernet/nuvoton/w90p910_ether.c
between commit:
00d2fbf73d55 ("net: remove w90p910-ether driver")
from the arm-soc tree and commit:
d1a55841ab24 ("net: Remove dev_err() usage after platform_get_irq()")
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 ("r8152:
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"")
>
> fro
1 - 100 of 620 matches
Mail list logo
