linux-next: build warning after merge of the net-next tree

code other atomics in .imm") -- Cheers, Stephen Rothwell pgpxN5TZYduxg.pgp Description: OpenPGP digital signature

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

ntainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml index

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

bmitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/netfilter/nf_tables_api.c index 9a080767667b,a11bc8dcaa82.. --- a/net/netfilter/nf_tables_

linux-next: Signed-off-by missing for commit in the net-next tree

Hi all, Commit 5137d303659d ("net: flow_offload: Fix memory leak for indirect flow block") is missing a Signed-off-by from its committer. -- Cheers, Stephen Rothwell pgpY4y_YDX2tE.pgp Description: OpenPGP digital signature

Re: linux-next: Signed-off-by missing for commit in the net-next tree

Hi all, On Thu, 10 Dec 2020 21:37:13 +1100 Stephen Rothwell wrote: > > Commit > > 5137d303659d ("net: flow_offload: Fix memory leak for indirect flow block") > > is missing a Signed-off-by from its committer. Sorry, that is in the net tree (not net-next).

linux-next: build failure after merge of the net-next tree

d73f4d2 ("cifs: Set witness notification handler for messages from userspace daemon") from the cifs tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Mon, 14 Dec 2020 13:09:27 +1100 Subject: [PATCH] fixup for "treewide: rename nla_strlcpy to nla_strsc

linux-next: build warnings after merge of the net-next tree

ower limitations") -- Cheers, Stephen Rothwell pgpcvp16Vt1uK.pgp Description: OpenPGP digital signature

Re: linux-next: build warning after merge of the net-next tree

Hi all, On Thu, 26 Nov 2020 17:40:57 +1100 Stephen Rothwell wrote: > > After merging the net-next tree, today's linux-next build (htmldocs) > produced this warning: > > include/linux/phy.h:869: warning: Function parameter or member 'config_intr' > not describe

Re: linux-next: manual merge of the userns tree with the bpf-next tree

Hi all, On Thu, 26 Nov 2020 16:22:48 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the userns tree got a conflict in: > > kernel/bpf/task_iter.c > > between commit: > > 91b2db27d3ff ("bpf: Simplify task_file_seq_get_next()")

Re: linux-next: manual merge of the akpm-current tree with the bpf-next tree

Hi all, On Fri, 4 Dec 2020 20:20:05 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the akpm-current tree got conflicts in: > > include/linux/memcontrol.h > mm/memcontrol.c > > between commit: > > bcfe06bf2622 ("mm: memcontrol:

Re: linux-next: build failure after merge of the block tree

Hi all, On Mon, 7 Dec 2020 14:09:51 +1100 Stephen Rothwell wrote: > > After merging the block tree, today's linux-next build (powerpc > ppc64_defconfig) failed like this: > > fs/io_uring.c: In function 'io_shutdown': > fs/io_uring.c:3782:9: error: too many argu

Re: linux-next: manual merge of the akpm-current tree with the bpf-next tree

Hi Jakub, On Mon, 14 Dec 2020 18:06:29 -0800 Jakub Kicinski wrote: > > AFAIU all we can do is tell Linus about the merge issue, and point > at Stephen's resolution. This is the correct response. -- Cheers, Stephen Rothwell pgpnhmtyKgstY.pgp Description: OpenPGP digital signature

Re: linux-next: build failure after merge of the net-next tree

Hi all, On Mon, 14 Dec 2020 13:14:38 +1100 Stephen Rothwell wrote: > > After merging the net-next tree, today's linux-next build (x86_64 > allmodconfig) failed like this: > > fs/cifs/cifs_swn.c: In function 'cifs_swn_notify': > fs/cifs/cifs_swn.c:450:4: error:

Re: [EXTERNAL] Re: linux-next: build failure after merge of the net-next tree

to build as nla_strscpy does not exist in your tree ... Just remove that commit and tell Linus about the necessary change and he can add it to the merge. And, no, rebasing your tree in Linus', or even doing a merge with Linus' tree is not really a reasonable option at this point. -- Ch

Re: linux-next: build warnings after merge of the net-next tree

Hi all, On Mon, 14 Dec 2020 20:10:25 +1100 Stephen Rothwell wrote: > > After merging the net-next tree, today's linux-next build (htmldocs) > produced these warnings: > > include/net/cfg80211.h:1759: warning: Cannot understand * @struct > cfg80211_sar_chan_ranges - sar

Re: [PATCH] powerpc: fix the allyesconfig build

#x27;ve sent a patch > https://lore.kernel.org/r/20201130085743.1656317-1-geert+rene...@glider.be > (when lore is back) Absolutely, thanks. -- Cheers, Stephen Rothwell pgp4r6wkBm2ZI.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the bpf-next tree

OLL) || defined(CONFIG_XPS). I have applied the following patch for today. From bd2a1a4a773c1f306460b4309b12cad245a5edad Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Tue, 1 Dec 2020 19:02:58 +1100 Subject: [PATCH] fix for "xsk: Propagate napi_id to XDP socket Rx path" Signed-off-by

linux-next: manual merge of the akpm tree with the bpf-next tree

ubmitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc fs/eventpoll.c index a80a290005c4,88f5b26806e5.. --- a/fs/eventpoll.c +++ b/fs/even

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

or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpbSWi1MxXW3.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the net-next tree

x return path") interacting with commit ed1182dc004d ("xdp: Handle MEM_TYPE_XSK_BUFF_POOL correctly in xdp_return_buff()") from the bpf tree. I applied the following merge fix patch. From: Stephen Rothwell Date: Wed, 2 Dec 2020 12:33:14 +1100 Subject: [PATCH] fix

linux-next: manual merge of the akpm-current tree with the bpf-next tree

concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. I also added this merge fix patch:

linux-next: build failure after merge of the block tree

hutdown(2)") interacting with commit dba4a9256bb4 ("net: Remove the err argument from sock_from_file") from the bpf-next tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Mon, 7 Dec 2020 14:04:10 +1100 Subject: [PATCH] fixup for "net: Remove the

Re: linux-next: Tree for Dec 9 (ethernet/mellanox/mlx5)

Hi all, On Wed, 9 Dec 2020 12:14:39 -0800 Randy Dunlap wrote: > > On 12/9/20 2:44 AM, Stephen Rothwell wrote: > > Hi all, > > > > Changes since 20201208: > > > > on i386: > > I see this warning:/note: repeated 106 times on i386 build: > &g

linux-next: manual merge of the userns tree with the bpf-next tree

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc kernel/bpf/task_iter.c index 0458a40edf10,4ec63170c741.. --- a/kernel/bpf/task_iter.c +++ b/kernel/bpf/task_iter.c @@

linux-next: build warning after merge of the net-next tree

emove the .did_interrupt() and .ack_interrupt() callback") -- Cheers, Stephen Rothwell pgpoZ9yaOaIVW.pgp Description: OpenPGP digital signature

[PATCH] powerpc: fix the allyesconfig build

: Jakub Kicinski Cc: Nicholas Piggin Cc: Daniel Axtens Cc: Joel Stanley Signed-off-by: Stephen Rothwell --- drivers/clk/renesas/Kconfig| 4 drivers/net/ethernet/hisilicon/Kconfig | 4 2 files changed, 8 insertions(+) It might be easiest to put this through the PowerPC

Re: [PATCH] powerpc: fix the allyesconfig build

is 12 bytes long). They are surrounded by #pragma pack(1)/pack(). This forces the 2 pointers in each second array element of hclge_dbg_reg_info[] to be 4 byte aligned (where pointers are 8 bytes long on PPC64). -- Cheers, Stephen Rothwell pgpT5k6hoB2Y6.pgp Description: OpenPGP digital signature

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

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/ibm/ibmvnic.c index bca1becd33f0,cdd1ff9aa9c4.. --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b

linux-next: build warning after merge of the bpf-next tree

ame, const void *data, unsigned int data_size) |^~~~ Introduced by commit 36e68442d1af ("bpf: Load and verify kernel module BTFs") -- Cheers, Stephen Rothwell pgppCCCbWkxiN.pgp Description: OpenPGP digital signature

Re: [PATCH bpf-next v5 01/34] mm: memcontrol: use helpers to read page's memcg data

eviewed-by: Shakeel Butt > Acked-by: Michal Hocko > Signed-off-by: Andrew Morton > Signed-off-by: Stephen Rothwell What is going on here? You are taking patches from linux-next and submitting them to another maintainer? Why? You should not do that from Andrew's tree as it change

linux-next: build warning after merge of the net-next tree

lete the DLCI / SDLA drivers") -- Cheers, Stephen Rothwell pgpSNZ7MgOybe.pgp Description: OpenPGP digital signature

Re: linux-next: build warnings after merge of the net-next tree

Hi all, On Mon, 21 Dec 2020 12:28:39 +1100 Stephen Rothwell wrote: > > On Mon, 14 Dec 2020 20:10:25 +1100 Stephen Rothwell > wrote: > > > > After merging the net-next tree, today's linux-next build (htmldocs) > > produced these warnings: > > > >

linux-next: build warning after merge of the origin tree

ieee80211_set_sar_specs") Sorry, I missed this earlier. -- Cheers, Stephen Rothwell pgp0aHpY6HSC2.pgp Description: OpenPGP digital signature

Re: linux-next: build warning after merge of the origin tree

Hi Johannes, On Wed, 06 Jan 2021 23:23:42 +0100 Johannes Berg wrote: > > On Thu, 2021-01-07 at 09:05 +1100, Stephen Rothwell wrote: > > Hi all, > > > > Building Linus' tree, today's linux-next build (htmldocs) produced > > this warning: > > >

Re: linux-next: build warning after merge of the origin tree

what to say. I even added "cfg80211/mac80211" to the > subject, but somehow lost the change to mac80211.h. Sorry about that :( No worries. > I'll get a v3 out. Thanks. -- Cheers, Stephen Rothwell pgptx8dgykNUC.pgp Description: OpenPGP digital signature

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

to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpZrCZJH5XJw.pgp Description: OpenPGP digital signature

Re: arm64 build broken on linux next 20201021 - include/uapi/asm-generic/unistd.h:862:26: error: array index in initializer exceeds array bounds

e __NR_syscalls in include/uapi/asm-generic/unistd.h needed to be fixed up in the notifications tree merge to be 442. Sorry about that, I will use the correct merge resolution tomorrow. -- Cheers, Stephen Rothwell pgpt43MUu2jWi.pgp Description: OpenPGP digital signature

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

ing. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/ibm/ibmvnic.c index da15913879f8,f4167de30461.. --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b

linux-next: Fixes tag needs some work in the net-next tree

fd8e8b ("veth: allow enabling NAPI even without XDP") -- Cheers, Stephen Rothwell pgpbYNCA2ROwz.pgp Description: OpenPGP digital signature

linux-next: manual merge of the ftrace tree with the bpf-next tree

or merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpobBm8IW0KX.pgp Description: OpenPGP digital signature

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

hould be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/uapi/linux/pkt_cl

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

Hi all, On Thu, 21 Jan 2021 13:26:45 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the devicetree tree got a conflict in: > > Documentation/devicetree/bindings/net/ti,k3-am654-cpsw-nuss.yaml > > between commit: > > 19d9a846d9fc ("dt-bi

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

Hi all, On Mon, 25 Jan 2021 11:12:23 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the bpf-next tree got a conflict in: > > net/ipv4/tcp.c > > between commit: > > 7eeba1706eba ("tcp: Add receive timestamp support for receive zerocopy.

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

Hi Arjun, On Sun, 14 Feb 2021 13:40:38 -0800 Arjun Roy wrote: > > Sorry, I was confused from the prior email. Is any action required at > the moment, or not? No. This is just something that the net-next and bpf-next maintainers need to sort out when they merge their trees. -- Cheers

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

rned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell di

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

o minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_main.c index a2e0b548bf57,d3534b657b98.. --- a/drivers/net/ethernet/mellanox/mlx5/core/en_main.c +++ b/drivers/net/ethernet/mellanox/mlx5/core/en_main.c @@@ -

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

The ordering is not set in stone yet (I have only done the merge in the linux-next tree), just make sure that Dave knows what it should look like when he merges the net and net-next trees. -- Cheers, Stephen Rothwell pgpN6LBT4u1D7.pgp Description: OpenPGP digital signature

linux-next: manual merge of the net-next tree with the arm-soc tree

arly complex conflicts. -- Cheers, Stephen Rothwell 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 @@@ -42,11 -42,20 +42,29

linux-next: manual merge of the gpio-brgl tree with the net-next tree

ng. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc MAINTAINERS index 9a8285485f0d,656ae6685430.. --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -2615,13 -2641,11 +2615,

linux-next: manual merge of the gpio-brgl tree with the arm-soc, net-next trees

nsider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpTahKp7VNPx.pgp Description: OpenPGP digital signature

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

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.. >

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

hould be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/ibm/ibmvni

linux-next: build warnings after merge of the net-next tree

code other atomics in .imm") Sorry that I missed these earlier. -- Cheers, Stephen Rothwell pgp4aUbeJziKx.pgp Description: OpenPGP digital signature

Re: linux-next: build warnings after merge of the net-next tree

Hi all, On Fri, 19 Feb 2021 07:52:56 +1100 Stephen Rothwell wrote: > > After merging the net-next tree, today's linux-next build (htmldocs) > produced these warnings: > > Documentation/networking/filter.rst:1053: WARNING: Inline emphasis > start-string without end-

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

Hi all, On Mon, 15 Feb 2021 07:53:21 +1100 Stephen Rothwell wrote: > > On Thu, 21 Jan 2021 13:26:45 +1100 Stephen Rothwell > wrote: > > > > Today's linux-next merge of the devicetree tree got a conflict in: > > > > Documentation/devicetree/b

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

Hi all, On Tue, 16 Feb 2021 18:19:38 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the gpio-brgl tree got a conflict in: > > MAINTAINERS > > between commit: > > df53e4f48e8d ("MAINTAINERS: Add entries for Toshiba Visconti ethernet >

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

Hi Grygorii, On Mon, 22 Feb 2021 12:35:10 +0200 Grygorii Strashko wrote: > > Sorry for inconvenience, is there anything I can do to help resolve it? > (Changes went through a different trees) No, it is fine. -- Cheers, Stephen Rothwell pgpF0k0K_zLOS.pgp Description: OpenPG

Re: [PATCH net-next] docs: nf_flowtable: fix compilation and warnings

> ends without a blank line; unexpected unindent. > > Fixes: 143490cde566 ("docs: nf_flowtable: update documentation with > enhancements") > Reported-by: Stephen Rothwell > Signed-off-by: Pablo Neira Ayuso > --- > Documentation/networking/nf_flowtable.

Re: linux-next: build failure after merge of the bpf-next tree

Hi all, On Fri, 12 Mar 2021 12:00:14 +1100 Stephen Rothwell wrote: > > [Cc'ing a few (maybe) interested parties] > > On Thu, 11 Mar 2021 07:47:03 +0100 Björn Töpel wrote: > > > > On 2021-03-11 01:47, Stephen Rothwell wrote: > > > > > > Afte

linux-next: build warning after merge of the net-next tree

tack messages for bearer/media failure") -- Cheers, Stephen Rothwell pgp7jfJGScDnV.pgp Description: OpenPGP digital signature

linux-next: Fixes tag needs some work in the net-next tree

- Subject has leading but no trailing quotes Please do not split Fixes tags over more than one line. -- Cheers, Stephen Rothwell pgptyXJiqPdwx.pgp Description: OpenPGP digital signature

Re: linux-next: build failure after merge of the tip tree

speculation - no random-config with x86(-64) plus CONFIG_BPF_JIT=y? I detected it with an X86_64 allmodconfig build (which I do all day). -- Cheers, Stephen Rothwell pgp949v2LvUws.pgp Description: OpenPGP digital signature

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

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/linux/bpf.h index fdac0534ce79,39dce9d3c3a5.. --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@@ -40,7 -40,7 +40,8 @@@ struct b

linux-next: Fixes tag needs some work in the net-next tree

sctls to u8") -- Cheers, Stephen Rothwell pgps5BfgYERcS.pgp Description: OpenPGP digital signature

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

nflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet

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

ng with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/nfc/nci/uart.c index 6af5752cde09,9958b37d8f9d.. --- a/net/nfc/nci/uart.c +++ b/net/nfc/nci/uart.c @@@ -229,6 -229,72 +229,72 @@@ static void n

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

ng. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc include/linux/ethtool.h index cdca84e6dd6b,5c631a298994.. --- a/include/linux/ethtool.h +++ b/include/linux/etht

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

when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpkKxyJkzanT.pgp Description: OpenPGP digital signature

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

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/core/skmsg.c index 5def3a2e85be,92a83c02562a.. --- a/net/core/skmsg.c +++ b/net/core/skmsg.c @@@ -806,12 -900,17 +900,13 @@@ int sk_p

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

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgprsqqoz2KQg.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the net-next tree

ote: in definition of macro 'list_entry_is_head' 619 | (&pos->member == (head)) |^~~~ net/bridge/netfilter/ebtables.c:1248:2: note: in expansion of macro 'list_for_each_entry' 1248 | list_for_each_entry(t, &net->xt.tables[NFPROTO_BRIDGE],

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

any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/ne

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

} > >+} > >+ } > > With https://git.kernel.org/netdev/net/c/00423969d806 that reverts > stmmac_reinit_rx_buffers(), then the above dma_recycle_rx_skbufs() > is no longer needed when net-next is sent for merge. Thanks. I have added removal of that (now unused) function to my merge resolution. -- Cheers, Stephen Rothwell pgpp8OZv02pLH.pgp Description: OpenPGP digital signature

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

t to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/ipv4/tcp.c index e1a17c6b473c,26aa923cf522.. --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@@ -4160,18 -4098,13 +4160,20 @@@ sta

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

is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_ethtool.c index 302001d6661e,2e5a0696374a..0

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

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 to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rot

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

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 to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. From: Stephen R

linux-next: build warning after merge of the net-next tree

et/mlx5: Add devlink subfunction port documentation") -- Cheers, Stephen Rothwell pgpCZa8UNzHO8.pgp Description: OpenPGP digital signature

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

your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/ipv4/ip_vti.c index eb207089ece0,613741384490..000

linux-next: Fixes tag needs some work in the net tree

g -1 --format='Fixes: %h ("%s")' Maybe you meant Fixes: edac63861db7 ("net: macb: add userio bits as platform configuration") -- Cheers, Stephen Rothwell pgpV7V0bB51dD.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the bpf-next tree

rs from libbpf_util.h to xsk.h") I have used the bpf tree from next-20210310 for today. -- Cheers, Stephen Rothwell pgpuAIV3LzBWI.pgp Description: OpenPGP digital signature

Re: linux-next: build failure after merge of the bpf-next tree

Hi Björn, [Cc'ing a few (maybe) interested parties] On Thu, 11 Mar 2021 07:47:03 +0100 Björn Töpel wrote: > > On 2021-03-11 01:47, Stephen Rothwell wrote: > > > > After merging the bpf-next tree, today's linux-next build (perf) failed > > like this: > >

linux-next: Fixes tag needs some work in the net tree

th rebasing for, but can be avoided in the future by setting core.abbrev to 12 (or more) or (for git v2.11 or later) just making sure it is not set (or set to "auto"). -- Cheers, Stephen Rothwell pgppptxGWZ4b2.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the net-next tree

uot;) I have used the net-next tree from next-20210203 fot today. -- Cheers, Stephen Rothwell pgpyl7InsTtnq.pgp Description: OpenPGP digital signature

Re: linux-next: build failure after merge of the net-next tree

e patch was badly wrapped and whitespace damaged :-)) -- Cheers, Stephen Rothwell pgpQpSow7JFHk.pgp Description: OpenPGP digital signature

linux-next: build warning after merge of the net-next tree

behavior") -- Cheers, Stephen Rothwell pgpDrdMdIUKv_.pgp Description: OpenPGP digital signature

linux-next: build warning after merge of the net-next tree

ndent. Introduced by commit 8411abbcad8e ("Documentation: networking: dsa: mention integration with devlink") -- Cheers, Stephen Rothwell pgpcF8bxE7DTs.pgp Description: OpenPGP digital signature

linux-next: build warning after merge of the net-next tree

uct device *dev) ^ Introduced by commit ccf8b940e5fd ("e1000e: Leverage direct_complete to speed up s2ram") CONFIG_PM_SLEEP is not set for this build. -- Cheers, Stephen Rothwell pgpYxP3wW92bG.pgp Description: OpenPGP digital signature

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

may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/pensando/ionic/ionic_txrx.c index 4087311f7082,03e00a6c413a.. --- a/drivers/net/ethernet/pensando/ionic/i

linux-next: build warning after merge of the net-next tree

n copy of user subscription to struct tipc_subscription") -- Cheers, Stephen Rothwell pgpjuucoGXumu.pgp Description: OpenPGP digital signature

linux-next: build warnings after merge of the net-next tree

ble.c:559: WARNING: Block quote ends without a blank line; unexpected unindent. Introduced by commit 908148bc5046 ("tipc: refactor tipc_sendmsg() and tipc_lookup_anycast()") -- Cheers, Stephen Rothwell pgp8Xa3fV3hrb.pgp Description: OpenPGP digital signature

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

hen your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgpq6hHh_dvYE.pgp Description: OpenPGP digital signature

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

t 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 to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Ro

linux-next: Fixes tag needs some work in the net tree

fix, but it can be fixed for future commits by setting core.abbrev to 12 (or more) or (for git v2.11 or later) just making sure it is not set (or set to "auto"). -- Cheers, Stephen Rothwell pgpXL5qRWScjC.pgp Description: OpenPGP digital signature

linux-next: build failure after merge of the tip tree

n") interacting with commit b90829704780 ("bpf: Use NOP_ATOMIC5 instead of emit_nops(&prog, 5) for BPF_TRAMP_F_CALL_ORIG") from the net tree. I have applied the following merge fix patch. From: Stephen Rothwell Date: Mon, 22 Mar 2021 14:30:37 +1100 Subject: [PATCH] x86:

linux-next: build warning after merge of the net-next tree

et: add CONFIG_PCPU_DEV_REFCNT") -- Cheers, Stephen Rothwell pgpMPaKHvZaTV.pgp Description: OpenPGP digital signature

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

ted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/core/en_tc.c index df2a0af854bb,730f33ada90a.. --- a/drivers/n

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

is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc drivers/net/ethernet/mellanox/mlx5/core/sf/hw_table.c index a5a0f60bef66,3c8a00dd573a.. -

linux-next: build warning after merge of the net-next tree

ommit 143490cde566 ("docs: nf_flowtable: update documentation with enhancements") -- Cheers, Stephen Rothwell pgpnuzKP6gmwc.pgp Description: OpenPGP digital signature

Re: linux-next: build warning after merge of the net-next tree

Hi all, On Thu, 25 Mar 2021 17:23:50 +1100 Stephen Rothwell wrote: > > After merging the net-next tree, today's linux-next build (htmldocs) > produced this warning: > > Sphinx parallel build error: > docutils.utils.SystemMessage: > /home/sfr/next/next/Documentation/n

  1   2   3   4   5   6   7   8   >