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
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
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
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 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
Hi,
> -Original Message-
> From: Stephen Rothwell [mailto:s...@canb.auug.org.au]
> Sent: Tuesday, February 16, 2021 11:05 AM
> To: David Miller ; Networking ;
> Olof Johansson ; Arnd
> Bergmann ; ARM
> Cc: Bartosz Golaszewski ; Linux Kernel Mailing
> List ; Linux
> Next Mailing List ; i
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
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
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 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
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:
> 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
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
>-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:
>
> drivers/net/ethernet/freescale/enetc/enetc_pf
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:
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
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
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
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
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
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
On Thu, Aug 15, 2019 at 10:21:29PM -0700, Andrii Nakryiko wrote:
> On Thu, Aug 15, 2019 at 7:42 PM Stephen Rothwell
> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in:
> >
> > scripts/link-vmlinux.sh
> >
> > between commit:
> >
> > e167191e4a8a ("
Hi all,
On Fri, 16 Aug 2019 16:01:28 +1000 Stephen Rothwell
wrote:
>
> On Thu, 15 Aug 2019 22:21:29 -0700 Andrii Nakryiko
> wrote:
> >
> > Thanks, Stephen! Looks good except one minor issue below.
>
> Thanks for checking.
>
> > > vmlinux_link()
> > > {
> > > + info LD ${2}
>
Hi Andrii,
On Thu, 15 Aug 2019 22:21:29 -0700 Andrii Nakryiko
wrote:
>
> Thanks, Stephen! Looks good except one minor issue below.
Thanks for checking.
> > vmlinux_link()
> > {
> > + info LD ${2}
>
> This needs to be ${1}.
At least its only an information message and doesn't affe
On Thu, Aug 15, 2019 at 7:42 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> scripts/link-vmlinux.sh
>
> between commit:
>
> e167191e4a8a ("kbuild: Parameterize kallsyms generation and correct
> reporting")
>
> from the kbuild tr
Hi Yoshinori,
On Fri, 12 Jul 2019 14:49:00 +0900 Yoshinori Sato
wrote:
>
> I can not update sh-next now, so I will fix it tomorrow.
You don't need to (and should not) update your tree, just mention the
conflicts to Linus when you send your pull request.
--
Cheers,
Stephen Rothwell
pgpyTDaeN
On Fri, 12 Jul 2019 09:59:28 +0900,
Stephen Rothwell wrote:
>
> [1 ]
> Hi all,
>
> On Mon, 17 Jun 2019 11:40:11 +1000 Stephen Rothwell
> wrote:
> >
> > Today's linux-next merge of the net-next tree got conflicts in:
> >
> > arch/sh/configs/se7712_defconfig
> > arch/sh/configs/se7721_defco
Hi all,
On Mon, 17 Jun 2019 11:40:11 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/sh/configs/se7712_defconfig
> arch/sh/configs/se7721_defconfig
> arch/sh/configs/titan_defconfig
>
> between commit:
>
> 7c04efc8d2ef ("sh: c
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,
On Mon, 17 Jun 2019 11:40:11 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the net-next tree got conflicts in:
>
> arch/sh/configs/se7712_defconfig
> arch/sh/configs/se7721_defconfig
> arch/sh/configs/titan_defconfig
>
> between commit:
>
> 7c04efc8d2ef ("sh: c
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 i
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 tre
On Wed, Feb 27, 2019 at 11:24:51AM -0500, Doug Ledford wrote:
> On Wed, 2019-02-27 at 11:25 +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in:
> >
> > drivers/infiniband/hw/mlx4/Kconfig
> >
> > between commit:
> >
> > 6fa8f1afd337
On Wed, 2019-02-27 at 11:25 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx4/Kconfig
>
> between commit:
>
> 6fa8f1afd337 ("IB/{core,uverbs}: Move ib_umem_xxx functions from ib_core to
> ib_uverbs")
On Tue, Feb 19, 2019 at 5:07 PM Daniel Borkmann wrote:
>
> On 02/20/2019 01:41 AM, Alexei Starovoitov wrote:
> > On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell
> > wrote:
> >>
> >> Hi all,
> >>
> >> Today's linux-next merge of the net-next tree got a conflict in:
> >>
> >> tools/testing/self
On 02/20/2019 01:41 AM, Alexei Starovoitov wrote:
> On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell
> wrote:
>>
>> Hi all,
>>
>> Today's linux-next merge of the net-next tree got a conflict in:
>>
>> tools/testing/selftests/bpf/test_progs.c
>>
>> between commit:
>>
>> f6be4d16039b ("selftest
Hi Stanislav,
On Tue, 19 Feb 2019 16:45:46 -0800 Stanislav Fomichev wrote:
>
> OTOH, I don't understand why is there a conflict? bpf and bpf-next
> adding tests in the same place/file? Those can be trivially resolved
> when bpf and bpf-next are merged in the next window.
Yes, and yes :-)
--
Ch
On Tue, Feb 19, 2019 at 4:41 PM Alexei Starovoitov
wrote:
>
> On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell
> wrote:
> >
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in:
> >
> > tools/testing/selftests/bpf/test_progs.c
> >
> > between commit:
> >
> > f6
On Tue, Feb 19, 2019 at 4:37 PM Stephen Rothwell wrote:
>
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_progs.c
>
> between commit:
>
> f6be4d16039b ("selftests/bpf: make sure signal interrupts
> BPF_PROG_TEST_RUN")
Ouch.
On Mon, Feb 18, 2019 at 11:05:49AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/ib_rep.c
>
> between commits:
>
> 459cc69fa4c1 ("RDMA: Provide safe ib_alloc_device() function")
> fc9e4477f924 ("RDM
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 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 determ
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
> representors"
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 digital
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:
> > d
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
> es
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: clear
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:
>
On Wed, Dec 12, 2018 at 12:02:52PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> cb4f131e1f2c ("MAINTAINERS: Patch monkey for the Hyper-V code")
>
> from the char-misc.current tree and c
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 co
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 tre
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: cls_u32
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:
>
>
> + /* Create a new file under /proc/net/ipconfig */
> + static int ipconfig_proc_net_create(const char *name,
> + const struct file_operations *fops)
> + {
> + char *pname;
> + struct proc_dir_entry *p;
> +
> + if (!ipconfig_dir)
> + return
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
> > + TEST_PRO
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:
>
> a7b1
Hi all,
On Tue, 3 Apr 2018 13:14:54 +1000 Stephen Rothwell
wrote:
>
> 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:
>
> 2907938d2375 ("net/mlx5e: Use pcie_bandwidth_available() to compute
> bandw
From: Jason Gunthorpe
Date: Thu, 22 Mar 2018 22:33:15 -0600
> Doug and I moved to a shared repo location when we started maintain it
> as a team:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git
>
> The commit is here:
>
> https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdm
On Thu, Mar 22, 2018 at 1:53 AM, Stephen Rothwell
wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> net/mac80211/debugfs.c
> include/net/mac80211.h
>
> between commit:
>
> 7c181f4fcdc6 ("mac80211: add ieee80211_hw flag for QoS NDP support")
>
> from
On Fri, Mar 23, 2018 at 12:19:00AM -0400, David Miller wrote:
> From: Doug Ledford
> Date: Thu, 15 Mar 2018 21:18:02 -0400
>
> > Here's the commit (from the rdma git repo) with the proper merge fix
> > (although it also has other minor merge stuff that needs to be ignored):
> >
> > 2d873449a202
From: Doug Ledford
Date: Thu, 15 Mar 2018 21:18:02 -0400
> Here's the commit (from the rdma git repo) with the proper merge fix
> (although it also has other minor merge stuff that needs to be ignored):
>
> 2d873449a202 (Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next)
Really?
[davem
On Thu, 2018-03-15 at 21:18 -0400, Doug Ledford wrote:
> On Fri, 2018-03-16 at 11:56 +1100, Stephen Rothwell wrote:
> > Hi all,
> >
> > Today's linux-next merge of the net-next tree got a conflict in:
> >
> > drivers/infiniband/hw/mlx5/main.c
> >
> > between commit:
> >
> > 42cea83f9524 ("I
On Thu, Mar 15, 2018 at 09:18:02PM -0400, Doug Ledford wrote:
> Here's the commit (from the rdma git repo) with the proper merge fix
> (although it also has other minor merge stuff that needs to be ignored):
>
> 2d873449a202 (Merge branch 'k.o/wip/dl-for-rc' into k.o/wip/dl-for-next)
Stephen,
On Fri, 2018-03-16 at 11:56 +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> drivers/infiniband/hw/mlx5/main.c
>
> between commit:
>
> 42cea83f9524 ("IB/mlx5: Fix cleanup order on unload")
>
> from the rdma-fixes tree and com
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 net
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 init_tu
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")
>
> fr
On Tue, Jan 09, 2018 at 11:21:25AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> tools/testing/selftests/bpf/test_align.c
>
> between commit:
>
> 2b36047e7889 ("selftests/bpf: fix test_align")
>
> from the bpf tree and com
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() before call_rcu()")
> 3
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 tree
> is submitted for
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:
>
> 8c4083b30e
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.
> Un
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
> devi
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:
22c8
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.
sig
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: mv88e
Hi all,
On Tue, 22 Aug 2017 11:24:14 +1000 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the net-next tree got a conflict in:
>
> arch/arm64/boot/dts/rockchip/rk3328-evb.dts
>
> between commits:
>
> ab78718bda79 ("arm64: dts: rockchip: Enable tsadc module on RK3328
> eavluation
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 com
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 subm
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
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:
>
1 - 100 of 219 matches
Mail list logo
