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/xdp/xdp_umem.c index 3889bd9aec46,19e59d1a5e9f.. --- a/net/xdp/xdp_umem.c +++ b/net/xdp/xdp_umem.c @@@ -389,13 -349,10 +353,10 @@

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

e(u16 device_id) ^~~ Introduced by commit e086ba2fccda ("e1000e: disable s0ix entry and exit flows for ME systems") CONFIG_PM_SLEEP is not set for this build. -- Cheers, Stephen Rothwell pgpmcS1ibQ8Va.pgp Description: OpenPGP digital signature

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

ou 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/ipv6/af_inet6.c index b69496eaf922,aa4882929fd0.. --- a/net/ipv6/af_inet6.c +++ b/net/ipv6/af_inet6.c @@@ -60,

linux-next: manual merge of the jc_docs tree with the vfs and net-next trees

tainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc kernel/sysctl.c index 7858930d843f,2ba9f449d273.. --- a/kernel/sysctl.c +++ b/kernel/sysctl.c @@@ -1576,1734 -3358,83 +1576,1734 @@@ int proc_do_large_bitmap(stru

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

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/qcom,ipa.yaml index 7b749fc04c32,b2ac7606095b.. --- a/Documen

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

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

Re: [PATCH net 2/2 RESEND] ipmr: Add lockdep expression to ipmr_for_each_table macro

.mr_tables, list,\ > > lockdep_rtnl_is_held() || \ > > list_empty(&net->ipv4.mr_tables)) > > > (adding Stephen) I have changed the patch in my fixes tree to this. -- Cheers, Stephen Rothwell pgpUHcky_a4Vc.pgp Description: OpenPGP digital signature

Re: [PATCH] Fix suspicious RCU usage warning

-by: Jakub Kicinski > Signed-off-by: Madhuparna Bhowmik Thanks. Added to my fixes tree from tomorrow (until it turns up elsewhere). -- Cheers, Stephen Rothwell pgpykoucvWSSv.pgp Description: OpenPGP digital signature

linux-next: manual merge of the net-next tree with the net 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 drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.c index 992908e6eebf,eef855f11a01.. -

Re: linux-next boot error: WARNING: suspicious RCU usage in ip6mr_get_table

s? > > > > >> = > > >> WARNING: suspicious RCU usage > > >> 5.7.0-rc4-next-20200507-syzkaller #0 Not tainted > > >> - > > >> net/ipv6/ip6mr.c:124 RCU-list traversed in non-reader section!! > > >> > I had some doubt in this one, I have already mailed the maintainers, > waiting for their reply. This is blocking syzbot testing of linux-next ... are we getting anywhere? Will a patch similar to the ipmr.c one help here? -- Cheers, Stephen Rothwell pgp1DleRbeWY7.pgp Description: OpenPGP digital signature

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

Hi all, Commit be904b855200 ("sfc: make capability checking a nic_type function") is missing a Signed-off-by from its author. -- Cheers, Stephen Rothwell pgpIrC9uGhpYB.pgp Description: OpenPGP digital signature

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

ry. 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 to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex c

Re: linux-next boot error: WARNING: suspicious RCU usage in ip6mr_get_table

rity/evm/evm_main.c:231 RCU-list traversed in non-reader > > >> section!! > > >> > Here is the patch for this one: > https://lore.kernel.org/patchwork/patch/1233836/ Thanks, I will apply that one to linux-next today. -- Cheers, Stephen Rothwell pgpX_H7gNUAcG.pgp Description: OpenPGP digital signature

Re: linux-next boot error: WARNING: suspicious RCU usage in ipmr_get_table

Hi Qian, On Wed, 6 May 2020 16:21:05 -0400 Qian Cai wrote: > > > On May 6, 2020, at 4:16 PM, Stephen Rothwell wrote: > > > > Hi Qian, > > > > On Tue, 28 Apr 2020 09:56:59 -0400 Qian Cai wrote: > >> > >>> On Apr 28, 2020, at 4:57 AM

Re: linux-next boot error: WARNING: suspicious RCU usage in ipmr_get_table

RIG_RAX: 00bc > > >> RAX: ffda RBX: RCX: 7fe46005e67a > > >> RDX: 7fffef4235e0 RSI: 556ea53ddf9b RDI: 556ea6766760 > > >> RBP: 556ea53ddf9b R08: R09: 00000030 >

Re: linux-next boot error: WARNING: suspicious RCU usage in ipmr_get_table

Hi all, On Thu, 7 May 2020 06:16:35 +1000 Stephen Rothwell wrote: > > Hi Qian, > > On Tue, 28 Apr 2020 09:56:59 -0400 Qian Cai wrote: > > > > > On Apr 28, 2020, at 4:57 AM, Dmitry Vyukov wrote: > > >> net/ipv4/ipmr.c:136 RCU-list traversed in

Re: linux-next boot error: WARNING: suspicious RCU usage in ipmr_get_table

gt; > Never been picked up for a few months due to some reasons. You could probably > need to convince David, Paul, Steven or Linus to unblock the bot or carry > patches > on your own? Did you resubmit the patch series as Dave Miller asked you to (now that net-next is based on v5

Re: [PATCH 3/5] sysctl: remove all extern declaration from sysctl.c

" in drivers/char/random.c which is redundant now (in fact always was). There is already an "extern struct ctl_table epoll_table[];" in include/linux/poll.h, so could have included that in kernel/sysctl.c instead of adding the new one in include/linux/sysctl.h -- Cheers, Stephen Rothwell pgp5V6PUsifNo.pgp Description: OpenPGP digital signature

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

driver submission") has these problem(s): - Target SHA1 does not exist Maybe you meant Fixes: 87461f7a58ab ("net: phy: DP83822 initial driver submission") -- Cheers, Stephen Rothwell pgpYoeacJKRT1.pgp Description: OpenPGP digital signature

Re: linux-next: manual merge of the mlx5-next tree with the kspp-gustavo tree

Hi all, On Wed, 29 Apr 2020 12:06:25 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the mlx5-next tree got a conflict in: > > include/linux/mlx5/mlx5_ifc.h > > between commit: > > 3ba225b506a2 ("treewide: Replace zero-length array with fl

linux-next: manual merge of the net-next tree with the kspp-gustavo 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 pgpC

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

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/steering/dr_send.c index 18719acb7e54,c4ed25bb9ac8..

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 include/net/mptcp.h index 3bce2019e4da,5288fba56e55.. --- a/include/net/mptcp.h +++ b/include/net/mptcp.h @@@ -68,8

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

Hi Christoph, On Wed, 29 Apr 2020 08:54:04 +0200 Christoph Hellwig wrote: > > On Tue, Apr 28, 2020 at 11:49:34PM -0700, Alexei Starovoitov wrote: > > On Tue, Apr 28, 2020 at 11:47 PM Christoph Hellwig wrote: > > > > > > On Wed, Apr 29, 2020 at 04:45:07PM

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

ssary. 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 to consider cooperating with the maintainer of the conflicting tree to minimise any particularly com

linux-next: manual merge of the tip tree with the net-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 samples/bpf/Makefile index 4df11ddb9c75,42b571cde177.. --- a/samples/bpf/Makefile +++ b/samples/bpf/Makefile @@@ -168,38 -

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

Hi all, This is now a conflict between the net and net-next trees. On Tue, 8 Oct 2019 09:48:40 +1100 Stephen Rothwell wrote: > > Today's linux-next merge of the bpf-next tree got a conflict in: > > tools/lib/bpf/Makefile > > between commit: > > 1bd6352

linux-next: manual merge of the net-next tree with the arm-soc 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 pgpPp7c0f65W1.pgp Description: OpenPGP digital signature

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 pgpNhQtSlzNT9.pgp Description: OpenPGP digital signature

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

ed 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 pgp6EztnSch04.pgp Description: OpenPGP digital signature

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

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/mac80211/cfg.c index a1973a26c7fc,fcf1dfc3a1cc.. --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@@ -5,7 -4,

linux-next: manual merge of the net-next tree with the sh 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 arch/sh/configs/se7712_defconfig index 6ac7d362e106,1e116529735f..0

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

ider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc lib/Makefile index 83d7df2661ff,4eeb814eee2e.. --- a/lib/Makefile +++ b/lib/Makefile @@@ -17,20 -17,9 +17,20 @@@ KCO

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

12 (or more) or (for git v2.11 or later) just making sure it is not set (or set to "auto"). -- Cheers, Stephen Rothwell pgpZRvK3OJdI7.pgp Description: OpenPGP digital signature

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

en 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 pgpA8QbnJ9qHI.pgp Description: OpenPGP digital signature

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

proc_dointvec_minmax_bpf_stats() as an unused function. From: Stephen Rothwell Date: Thu, 28 Feb 2019 12:26:58 +1100 Subject: [PATCH] bpf: hack to make "enable program stats" build Signed-off-by: Stephen Rothwell --- kernel/sysctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-

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

hat important any in this case), just use this as a learning experience for next time :-) -- Cheers, Stephen Rothwell pgpW3lUUogoIy.pgp Description: OpenPGP digital signature

linux-next: manual merge of the net-next tree with the rdma 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 drivers/infiniband/hw/mlx4/Kconfig index db4aa13ebae0,4e9936731867.. --- a/drivers/infiniband/hw/mlx4/Kconfig

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

g -1 --format='Fixes: %h (%s)' -- Cheers, Stephen Rothwell pgpSzBINc6eQE.pgp Description: OpenPGP digital signature

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

he gcc warning can be turned off by adding a /* fall through */ comment at the point the fall through happens (assuming that the fall through is intentional). -- Cheers, Stephen Rothwell pgpVwSLB7xNDd.pgp Description: OpenPGP digital signature

linux-next: Fixes tags need some work in the net-next tree

Fixes: 1cd3ab86b713 ("net/mlx5e: Introduce mlx5e_flow_esw_attr_init() helper") has these problem(s): - Target SHA1 does not exist Did you mean Fixes: 988ab9c7363a ("net/mlx5e: Introduce mlx5e_flow_esw_attr_init() helper") -- Cheers, Stephen Rothwell pgpxENubqGUro.pgp Description: OpenPGP digital signature

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

Hi Vinod, On Wed, 20 Feb 2019 10:10:55 +0530 Vinod Koul wrote: > > Dave would you like to drop this and me sending updated patch or > something else.. Dave doesn't rebase/reset net-next, so we will just have to use this as a learning experience :-) -- Cheers, St

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

ow. Yes, and yes :-) -- Cheers, Stephen Rothwell pgp3GhVoktnUm.pgp Description: OpenPGP digital signature

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

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

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

dsa: qca8k: disable delay for RGMII mode") -- Cheers, Stephen Rothwell pgpbh50CKutii.pgp Description: OpenPGP digital signature

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

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 cf3c5095c10e,cab6b2f2f61d.. --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@@ -2577,9 -2595,11 +2596,10 @@@ int t

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

al 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 driver

linux-next: Fixes tags need some work in the net tree

ts long Can be fixed 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 pgpc1Xhwl2DkY.pgp Description: OpenPGP digital signature

linux-next: manual merge of the tip tree with the net-next 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. From: Stephen Rothwell Date: Fri, 15 Feb 2019 13:16:41 +1100 Subject: [PAT

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

' [-Wunused-variable] struct ethsw_port_priv *port_priv = netdev_priv(netdev); ^ Introduced by commit 1b8b589d9103 ("staging: fsl-dpaa2: ethsw: Remove getting PORT_BRIDGE_FLAGS") -- Cheers, Stephen Rothwell pgpa7LeFwAy1X.pgp Description: OpenPGP digital signature

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

arning: unused variable 'mlxsw_sp' [-Wunused-variable] struct mlxsw_sp *mlxsw_sp = mlxsw_sp_port->mlxsw_sp; ^~~~ Introduced by commit 1ecb195753a1 ("mlxsw: spectrum_switchdev: Remove getting PORT_BRIDGE_FLAGS") -- Cheers, Stephen Rothwell pgp704oZ

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

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

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

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

ore.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 pgpKg1hnvKqYg.pgp Description: OpenPGP digital signature

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

ith the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell pgp1cni0Qxg2I.pgp Description: OpenPGP digital signature

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

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/netfilter/nf_nat_l3proto_ipv4.c index fa2ba7c500e4,e26165af45c

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

e git log -1 --format='Fixes: %h ("%s")' -- Cheers, Stephen Rothwell pgp_OowLF5onA.pgp Description: OpenPGP digital signature

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

ner 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/phy/marvell/Kconfig index 224ea4e6a46d,b8e9dd38ad0d.. ---

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

Hi all, In commit ccc8ca9b90ac ("net/smc: fix byte_order for rx_curs_confirmed") Fixes tag Fixes: b8649efad879 ("net/smc: fix sender_free computation") (net-tree) has these problem(s): - The trailing '(net-tree)' is unexpected -- Cheers, Stephe

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

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_tc.c index b5c1b039375a,85c5dd7fc2c7..0

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

our 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_tc.c index 1c3c9fa26b55,83522c926d7c..0

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

n 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 pgpIDXntMQxkz.pgp Description: OpenPGP digital signature

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

xt/net/core/sock.c:1293:2: note: previously used here case SO_TIMESTAMP_NEW: ^~~~ Caused by commit 887feae36aee ("socket: Add SO_TIMESTAMP[NS]_NEW") I applied the following fix patch (I just update the clashing id rather than update them all, but the latter may be better). From: Step

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

IMESTAMPING_OLD: > if (val & ~SOF_TIMESTAMPING_MASK) { > ret = -EINVAL; Looks good, thanks. -- Cheers, Stephen Rothwell pgpoc2r5uSDDc.pgp Description: OpenPGP digital signature

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

additions early. The gcc warning can be turned off by adding a /* fall through */ comment at the point the fall through happens (assuming that the fall through is intentional). -- Cheers, Stephen Rothwell pgptsyvXhyq5M.pgp Description: OpenPGP digital signature

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

y simple searches for the subject ... -- Cheers, Stephen Rothwell pgpnzGNU1Vt77.pgp Description: OpenPGP digital signature

linux-next: Fixes tags need some work in the net tree

quot;net: tls: Save iv in tls_rec for async crypto requests") Fixes tag Fixes: a42055e8d2c30 ("Add support for async encryption of records...") has these problem(s): - Subject does not match target commit subject -- Cheers, Stephen Rothwell pgpn2PHZzMRe8.pgp Description: OpenPGP digital signature

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

assignment to 'struct enetc_rx_swbd *' from 'int' makes pointer from integer without a cast [-Wint-conversion] rxr->rx_swbd = vzalloc(rxr->bd_count * sizeof(struct enetc_rx_swbd)); ^ Caused by commit d4fd0404c1c9 ("enetc: Introduce basic PF and VF

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

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 to consider cooperating with the maintainer of the conflicting tree to minimise any partic

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

leading but no trailing quotes The Fixes tag line was split over 2 lines. Please, in the future, try to keep it on a single line. -- Cheers, Stephen Rothwell pgpoGpQVrluHK.pgp Description: OpenPGP digital signature

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 Documentation/networking/snmp_counter.rst index fe8f741193be,486ab33acc3a.. --- a/Documentation/networki

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

Hi all, Commit a22d3251423f ("Fix ERROR:do not initialise statics to 0 in af_vsock.c") is missing a Signed-off-by from its author. -- Cheers, Stephen Rothwell pgp7aOw8bWh72.pgp Description: OpenPGP digital signature

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

ot;net: bpfilter: restart bpfilter_umh when error occurred") -- Cheers, Stephen Rothwell pgpGSlyeSkr1U.pgp Description: OpenPGP digital signature

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

Hi all, Commit b19bce0335e2 ("net: ethernet: mediatek: fix warning in phy_start_aneg") is missing a Signed-off-by from its author. -- Cheers, Stephen Rothwell pgpbAmGprqq_j.pgp Description: OpenPGP digital signature

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

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 tools/testing/sel

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

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

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

he net tree interacting with commit 0e6160f3f5a9 ("vxlan: vxlan_fdb_notify(): Make switchdev notification configurable") from the net-next tree. I added the following merge fix patch for today. From: Stephen Rothwell Date: Thu, 20 Dec 2018 13:24:05 +1100 Subject: [PATCH] vxlan: fix for vxlan_fd

linux-next: manual merge of the net-next tree with the net 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 pgpqOJVGTGxYc.pgp Description: OpenPGP digital signature

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 tools/testing/selftests/net/Makefile index 923570a9708a,9543a4c2f9be.. --- a/tools/testing/selftests/net/Mak

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

ed 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/vxlan.c index 0565f8880199,71c3b7b6b1ab..000

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

Hi Gustavo, On Tue, 18 Dec 2018 21:07:06 -0600 "Gustavo A. R. Silva" wrote: > > On 12/18/18 8:42 PM, Stephen Rothwell wrote: > > Hi all, > > > > On Thu, 29 Nov 2018 11:24:28 +1100 Stephen Rothwell > > wrote: > >> > >>

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

Hi all, On Fri, 30 Nov 2018 12:05:55 +1100 Stephen Rothwell wrote: > > After merging the wireless-drivers-next tree, today's linux-next build > (x86_64 allmodconfig) produced these warnings: > > drivers/net/wireless/intel/iwlwifi/iwl-drv.c: In function > 'iwl_pa

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

Hi all, On Thu, 29 Nov 2018 11:24:28 +1100 Stephen Rothwell wrote: > > After merging the net-next tree, today's linux-next build > (x86_64_allmodconfig) produced this warning: > > drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c: In function 'run_xdp': > dri

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

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

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

ave used the net-next tree from next-20181214 for today. -- Cheers, Stephen Rothwell pgpV6rZ3ZJsJO.pgp Description: OpenPGP digital signature

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

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/ipv6/ip6_output.c index 4591ca4bdbe8,9d55ee33b7f9.. --- a/net/ipv6/ip6_output.c +++ b/net/ipv6/ip6

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 Rothw

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/crypto/chelsio/chtls/chtls_cm.c index 931b96c220af,228b91b7d6b5.. --- a/drivers/crypto/chelsio/chtls/chtls_

linux-next: manual merge of the rdma 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 pgpFjoEbSmcmh.pgp Description: OpenPGP digital signature

linux-next: manual merge of the net-next tree with the bpf 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 tools/testing/selftests/bpf/test_verifier.c index f8eac4a544f4,a08c67c8767e.. --- a/tools/testing

Re: linux-next: Signed-off-by missing for commits in the bpf-next tree

--interactive is given then only commits marked to be picked, edited or reworded will have the trailer added. -- Cheers, Stephen Rothwell pgpNeogmIBkyT.pgp Description: OpenPGP digital signature

Re: linux-next: Signed-off-by missing for commits in the bpf-next tree

Hi Alexei, On Wed, 12 Dec 2018 12:53:11 -0800 Alexei Starovoitov wrote: > > On Thu, Dec 13, 2018 at 07:32:45AM +1100, Stephen Rothwell wrote: > > Hi all, > > > > Commits > > > > 3bdc28aa2340 ("selftests/bpf: add btf annotations for > > cgrou

linux-next: Signed-off-by missing for commits in the bpf-next tree

3a785dc4c ("selftests/bpf: use __bpf_constant_htons in test_prog.c") are missing a Signed-off-by from their committers. -- Cheers, Stephen Rothwell pgpwY50pyrrjK.pgp Description: OpenPGP digital signature

linux-next: manual merge of the net-next tree with the char-misc.current 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 MAINTAINERS index 4a2a30380bed,a676b40ac1d6.. --- a/MAINTAINERS +++ b/MAINTAINERS @@@ -6930,11 -6902,9 +6931,11 @@@ Hyper-V C

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

Hi Dave, On Sun, 09 Dec 2018 16:54:43 -0800 (PST) David Miller wrote: > > From: Stephen Rothwell > Date: Mon, 10 Dec 2018 11:48:48 +1100 > > > That is fine as a last resort, but it is probably less disruptive to > > find these things before you try to push i.e. a

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 net/sched/cls_flower.c index 71312d7bd8f4,85e9f8e1da10.. --- a/net/sched/cls_flower.c +++ b/net/sched/cls_flowe

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

ith the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell diff --cc net/dsa/master.c index 5e8c9bef78bd,d7d5145aa235.. --- a/net/dsa/master.c +++ b/net/dsa/master.c @@@ -158,31 -158,36 +158,59 @@@ static void dsa_master_ethtoo

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

') am=false cm=false grep -i -F -q "$ae" <<<"$sob" || am=true grep -i -F -q "$ce" <<<"$sob" || cm=true "$am" && author_missing+=" $c" "$cm" && committer_missing+=" $c" done if [ "$author_missing" ]; then print_commits "author" $author_missing fi if [ "$committer_missing" ]; then print_commits "committer" $committer_missing fi exec gitk "$@" -- Cheers, Stephen Rothwell pgpyLKJRi2w_W.pgp Description: OpenPGP digital signature

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

Hi all, Commits dc9d38cec71c ("net: phy: mdio-gpio: Add phy_ignore_ta_mask to platform data") 04fa26bab06d ("net: phy: mdio-gpio: Add platform_data support for phy_mask") are missing a Signed-off-by from their author. -- Cheers, Stephen Rothwell pgprX3tKCp63x.pgp

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

al 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 pgp1wJLljZ6hr.pgp Description: OpenPGP digital signature

<    1   2   3   4   5   6   7   8   >