From: Lee Jones <hidden> Date: 2021-01-13 16:42:42
Fixes the following W=1 kernel build warning(s):
drivers/net/ethernet/smsc/smc91x.c:2200: warning: Function parameter or member 'dev' not described in 'try_toggle_control_gpio'
drivers/net/ethernet/smsc/smc91x.c:2200: warning: Function parameter or member 'desc' not described in 'try_toggle_control_gpio'
drivers/net/ethernet/smsc/smc91x.c:2200: warning: Function parameter or member 'name' not described in 'try_toggle_control_gpio'
drivers/net/ethernet/smsc/smc91x.c:2200: warning: Function parameter or member 'index' not described in 'try_toggle_control_gpio'
drivers/net/ethernet/smsc/smc91x.c:2200: warning: Function parameter or member 'value' not described in 'try_toggle_control_gpio'
drivers/net/ethernet/smsc/smc91x.c:2200: warning: Function parameter or member 'nsdelay' not described in 'try_toggle_control_gpio'
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Erik Stahlman <redacted>
Cc: Peter Cammaert <redacted>
Cc: Daris A Nevil <redacted>
Cc: Russell King <redacted>
Cc: netdev@vger.kernel.org
Signed-off-by: Lee Jones <redacted>
---
drivers/net/ethernet/smsc/smc91x.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Lee Jones <hidden> Date: 2021-01-13 16:43:12
Fixes the following W=1 kernel build warning(s):
drivers/net/ethernet/ti/am65-cpsw-qos.c:364: warning: Function parameter or member 'ndev' not described in 'am65_cpsw_timer_set'
drivers/net/ethernet/ti/am65-cpsw-qos.c:364: warning: Function parameter or member 'est_new' not described in 'am65_cpsw_timer_set'
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Ivan Khoronzhuk <redacted>
Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org>
Cc: netdev@vger.kernel.org
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Lee Jones <redacted>
---
drivers/net/ethernet/ti/am65-cpsw-qos.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Lee Jones <hidden> Date: 2021-01-13 16:43:12
Fixes the following W=1 kernel build warning(s):
drivers/net/ethernet/toshiba/ps3_gelic_net.c:1107: warning: Function parameter or member 'irq' not described in 'gelic_card_interrupt'
drivers/net/ethernet/toshiba/ps3_gelic_net.c:1107: warning: Function parameter or member 'ptr' not described in 'gelic_card_interrupt'
drivers/net/ethernet/toshiba/ps3_gelic_net.c:1407: warning: Function parameter or member 'txqueue' not described in 'gelic_net_tx_timeout'
drivers/net/ethernet/toshiba/ps3_gelic_net.c:1439: warning: Function parameter or member 'napi' not described in 'gelic_ether_setup_netdev_ops'
drivers/net/ethernet/toshiba/ps3_gelic_net.c:1639: warning: Function parameter or member 'dev' not described in 'ps3_gelic_driver_probe'
drivers/net/ethernet/toshiba/ps3_gelic_net.c:1795: warning: Function parameter or member 'dev' not described in 'ps3_gelic_driver_remove'
Cc: Geoff Levand <geoff@infradead.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <redacted>
Cc: Utz Bacher <redacted>
Cc: Jens Osterkamp <redacted>
Cc: netdev@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Lee Jones <redacted>
---
drivers/net/ethernet/toshiba/ps3_gelic_net.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
From: Lee Jones <hidden> Date: 2021-01-13 16:43:12
Fixes the following W=1 kernel build warning(s):
drivers/net/ethernet/ti/am65-cpts.c:736: warning: Function parameter or member 'en' not described in 'am65_cpts_rx_enable'
drivers/net/ethernet/ti/am65-cpts.c:736: warning: Excess function parameter 'skb' description in 'am65_cpts_rx_enable'
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Kurt Kanzenbach <kurt@linutronix.de>
Cc: netdev@vger.kernel.org
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Lee Jones <redacted>
---
drivers/net/ethernet/ti/am65-cpts.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
From: Lee Jones <hidden> Date: 2021-01-13 16:43:13
Fixes the following W=1 kernel build warning(s):
from drivers/net/ethernet/ibm/ibmvnic.c:35:
inlined from ‘handle_vpd_rsp’ at drivers/net/ethernet/ibm/ibmvnic.c:4124:3:
drivers/net/ethernet/ibm/ibmvnic.c:1362: warning: Function parameter or member 'hdr_field' not described in 'build_hdr_data'
drivers/net/ethernet/ibm/ibmvnic.c:1362: warning: Function parameter or member 'skb' not described in 'build_hdr_data'
drivers/net/ethernet/ibm/ibmvnic.c:1362: warning: Function parameter or member 'hdr_len' not described in 'build_hdr_data'
drivers/net/ethernet/ibm/ibmvnic.c:1362: warning: Function parameter or member 'hdr_data' not described in 'build_hdr_data'
drivers/net/ethernet/ibm/ibmvnic.c:1423: warning: Function parameter or member 'hdr_field' not described in 'create_hdr_descs'
drivers/net/ethernet/ibm/ibmvnic.c:1423: warning: Function parameter or member 'hdr_data' not described in 'create_hdr_descs'
drivers/net/ethernet/ibm/ibmvnic.c:1423: warning: Function parameter or member 'len' not described in 'create_hdr_descs'
drivers/net/ethernet/ibm/ibmvnic.c:1423: warning: Function parameter or member 'hdr_len' not described in 'create_hdr_descs'
drivers/net/ethernet/ibm/ibmvnic.c:1423: warning: Function parameter or member 'scrq_arr' not described in 'create_hdr_descs'
drivers/net/ethernet/ibm/ibmvnic.c:1474: warning: Function parameter or member 'txbuff' not described in 'build_hdr_descs_arr'
drivers/net/ethernet/ibm/ibmvnic.c:1474: warning: Function parameter or member 'num_entries' not described in 'build_hdr_descs_arr'
drivers/net/ethernet/ibm/ibmvnic.c:1474: warning: Function parameter or member 'hdr_field' not described in 'build_hdr_descs_arr'
drivers/net/ethernet/ibm/ibmvnic.c:1832: warning: Function parameter or member 'adapter' not described in 'do_change_param_reset'
drivers/net/ethernet/ibm/ibmvnic.c:1832: warning: Function parameter or member 'rwi' not described in 'do_change_param_reset'
drivers/net/ethernet/ibm/ibmvnic.c:1832: warning: Function parameter or member 'reset_state' not described in 'do_change_param_reset'
drivers/net/ethernet/ibm/ibmvnic.c:1911: warning: Function parameter or member 'adapter' not described in 'do_reset'
drivers/net/ethernet/ibm/ibmvnic.c:1911: warning: Function parameter or member 'rwi' not described in 'do_reset'
drivers/net/ethernet/ibm/ibmvnic.c:1911: warning: Function parameter or member 'reset_state' not described in 'do_reset'
Cc: Dany Madden <redacted>
Cc: Lijun Pan <redacted>
Cc: Sukadev Bhattiprolu <redacted>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <redacted>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Santiago Leon <redacted>
Cc: Thomas Falcon <redacted>
Cc: John Allen <redacted>
Cc: netdev@vger.kernel.org
Cc: linuxppc-dev@lists.ozlabs.org
Signed-off-by: Lee Jones <redacted>
---
drivers/net/ethernet/ibm/ibmvnic.c | 27 +++++++++++++--------------
drivers/net/xen-netfront.c | 6 +++---
2 files changed, 16 insertions(+), 17 deletions(-)
@@ -1496,10 +1496,9 @@ static int create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len,/***build_hdr_descs_arr-buildaheaderdescriptorarray-*@skb-socketbuffer-*@num_entries-numberofdescriptorstobesent-*@subcrq-firstTXdescriptor-*@hdr_field-bitfielddeterminingwhichheaderswillbesent+*@txbuff:txbuffer+*@num_entries:numberofdescriptorstobesent+*@hdr_field:bitfielddeterminingwhichheaderswillbesent**ThisfunctionwillbuildaTXdescriptorarraywithapplicable*L2/L3/L4packetheaderdescriptorstobesentbysend_subcrq_indirect.
From: Lee Jones <hidden> Date: 2021-01-13 16:43:48
Fixes the following W=1 kernel build warning(s):
drivers/net/xen-netback/xenbus.c:419: warning: Function parameter or member 'dev' not described in 'frontend_changed'
drivers/net/xen-netback/xenbus.c:419: warning: Function parameter or member 'frontend_state' not described in 'frontend_changed'
drivers/net/xen-netback/xenbus.c:1001: warning: Function parameter or member 'dev' not described in 'netback_probe'
drivers/net/xen-netback/xenbus.c:1001: warning: Function parameter or member 'id' not described in 'netback_probe'
Cc: Wei Liu <wei.liu@kernel.org>
Cc: Paul Durrant <paul@xen.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jesper Dangaard Brouer <hawk@kernel.org>
Cc: John Fastabend <john.fastabend@gmail.com>
Cc: Rusty Russell <redacted>
Cc: xen-devel@lists.xenproject.org
Cc: netdev@vger.kernel.org
Cc: bpf@vger.kernel.org
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Lee Jones <redacted>
---
drivers/net/xen-netback/xenbus.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
From: Lee Jones <hidden> Date: 2021-01-13 16:43:48
Fixes the following W=1 kernel build warning(s):
drivers/net/ethernet/toshiba/spider_net.c:263: warning: Function parameter or member 'hwdescr' not described in 'spider_net_get_descr_status'
drivers/net/ethernet/toshiba/spider_net.c:263: warning: Excess function parameter 'descr' description in 'spider_net_get_descr_status'
drivers/net/ethernet/toshiba/spider_net.c:554: warning: Function parameter or member 'netdev' not described in 'spider_net_get_multicast_hash'
drivers/net/ethernet/toshiba/spider_net.c:902: warning: Function parameter or member 't' not described in 'spider_net_cleanup_tx_ring'
drivers/net/ethernet/toshiba/spider_net.c:902: warning: Excess function parameter 'card' description in 'spider_net_cleanup_tx_ring'
drivers/net/ethernet/toshiba/spider_net.c:1074: warning: Function parameter or member 'card' not described in 'spider_net_resync_head_ptr'
drivers/net/ethernet/toshiba/spider_net.c:1234: warning: Function parameter or member 'napi' not described in 'spider_net_poll'
drivers/net/ethernet/toshiba/spider_net.c:1234: warning: Excess function parameter 'netdev' description in 'spider_net_poll'
drivers/net/ethernet/toshiba/spider_net.c:1278: warning: Function parameter or member 'p' not described in 'spider_net_set_mac'
drivers/net/ethernet/toshiba/spider_net.c:1278: warning: Excess function parameter 'ptr' description in 'spider_net_set_mac'
drivers/net/ethernet/toshiba/spider_net.c:1350: warning: Function parameter or member 'error_reg1' not described in 'spider_net_handle_error_irq'
drivers/net/ethernet/toshiba/spider_net.c:1350: warning: Function parameter or member 'error_reg2' not described in 'spider_net_handle_error_irq'
drivers/net/ethernet/toshiba/spider_net.c:1968: warning: Function parameter or member 't' not described in 'spider_net_link_phy'
drivers/net/ethernet/toshiba/spider_net.c:1968: warning: Excess function parameter 'data' description in 'spider_net_link_phy'
drivers/net/ethernet/toshiba/spider_net.c:2149: warning: Function parameter or member 'work' not described in 'spider_net_tx_timeout_task'
drivers/net/ethernet/toshiba/spider_net.c:2149: warning: Excess function parameter 'data' description in 'spider_net_tx_timeout_task'
drivers/net/ethernet/toshiba/spider_net.c:2182: warning: Function parameter or member 'txqueue' not described in 'spider_net_tx_timeout'
Cc: Ishizaki Kou <redacted>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Utz Bacher <redacted>
Cc: Jens Osterkamp <redacted>
Cc: netdev@vger.kernel.org
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Lee Jones <redacted>
---
drivers/net/ethernet/toshiba/spider_net.c | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
From: Jakub Kicinski <kuba@kernel.org> Date: 2021-01-14 02:36:49
On Wed, 13 Jan 2021 16:41:16 +0000 Lee Jones wrote:
Resending the stragglers again.
This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.
v2:
- Squashed IBM patches
- Fixed real issue in SMSC
- Added Andrew's Reviewed-by tags on remainder
From: Lee Jones <hidden> Date: 2021-01-14 08:35:06
On Wed, 13 Jan 2021, Jakub Kicinski wrote:
On Wed, 13 Jan 2021 16:41:16 +0000 Lee Jones wrote:
quoted
Resending the stragglers again.
This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.
v2:
- Squashed IBM patches
- Fixed real issue in SMSC
- Added Andrew's Reviewed-by tags on remainder
Does not apply, please rebase on net-next/master.
These are based on Tuesday's next/master.
I just rebased them now with no issue.
What conflict are you seeing?
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
From: Jakub Kicinski <kuba@kernel.org> Date: 2021-01-14 17:16:15
On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote:
On Wed, 13 Jan 2021, Jakub Kicinski wrote:
quoted
On Wed, 13 Jan 2021 16:41:16 +0000 Lee Jones wrote:
quoted
Resending the stragglers again.
This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.
v2:
- Squashed IBM patches
- Fixed real issue in SMSC
- Added Andrew's Reviewed-by tags on remainder
I just rebased them now with no issue.
What conflict are you seeing?
Applying: net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
error: patch failed: drivers/net/ethernet/smsc/smc91x.c:2192
error: drivers/net/ethernet/smsc/smc91x.c: patch does not apply
Patch failed at 0001 net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
From: Lee Jones <hidden> Date: 2021-01-14 19:55:17
On Thu, 14 Jan 2021, Jakub Kicinski wrote:
On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote:
quoted
On Wed, 13 Jan 2021, Jakub Kicinski wrote:
quoted
On Wed, 13 Jan 2021 16:41:16 +0000 Lee Jones wrote:
quoted
Resending the stragglers again.
This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.
v2:
- Squashed IBM patches
- Fixed real issue in SMSC
- Added Andrew's Reviewed-by tags on remainder
Does not apply, please rebase on net-next/master.
These are based on Tuesday's next/master.
What's next/master?
I'm not sure if this is a joke, or not? :)
next/master == Linux Next. The daily merged repo where all of the
*-next branches end up to ensure interoperability. It's also the
branch that is most heavily tested by the auto-builders to ensure the
vast majority of issues are ironed out before hitting Mainline.
Looks like net-next gets merged into next/master:
commit 452958f1f3d1c8980a8414f9c37c8c6de24c7d32
Merge: 1eabba209a17a f50e2f9f79164
Author: Stephen Rothwell [off-list ref]
Date: Thu Jan 14 10:35:40 2021 +1100
Merge remote-tracking branch 'net-next/master'
So I'm not sure what it's conflicting with.
Do you have patches in net-next that didn't make it into next/master
for some reason?
I'll try to rebase again tomorrow.
Hopefully I am able to reproduce your issue by then.
quoted
I just rebased them now with no issue.
What conflict are you seeing?
Applying: net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
error: patch failed: drivers/net/ethernet/smsc/smc91x.c:2192
error: drivers/net/ethernet/smsc/smc91x.c: patch does not apply
Patch failed at 0001 net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
hint: Use 'git am --show-current-patch=diff' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
From: Lee Jones <hidden> Date: 2021-01-15 11:19:26
On Thu, 14 Jan 2021, Lee Jones wrote:
On Thu, 14 Jan 2021, Jakub Kicinski wrote:
quoted
On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote:
quoted
On Wed, 13 Jan 2021, Jakub Kicinski wrote:
quoted
On Wed, 13 Jan 2021 16:41:16 +0000 Lee Jones wrote:
quoted
Resending the stragglers again.
This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.
v2:
- Squashed IBM patches
- Fixed real issue in SMSC
- Added Andrew's Reviewed-by tags on remainder
Does not apply, please rebase on net-next/master.
These are based on Tuesday's next/master.
What's next/master?
I'm not sure if this is a joke, or not? :)
next/master == Linux Next. The daily merged repo where all of the
*-next branches end up to ensure interoperability. It's also the
branch that is most heavily tested by the auto-builders to ensure the
vast majority of issues are ironed out before hitting Mainline.
Looks like net-next gets merged into next/master:
commit 452958f1f3d1c8980a8414f9c37c8c6de24c7d32
Merge: 1eabba209a17a f50e2f9f79164
Author: Stephen Rothwell [off-list ref]
Date: Thu Jan 14 10:35:40 2021 +1100
Merge remote-tracking branch 'net-next/master'
So I'm not sure what it's conflicting with.
Do you have patches in net-next that didn't make it into next/master
for some reason?
I'll try to rebase again tomorrow.
Hopefully I am able to reproduce your issue by then.
Okay so my development branch rebased again with no issue.
I also took the liberty to checkout net-next and cherry-pick the
patches [0], which again didn't cause a problem.
I'm not sure what else to suggest. Is your local copy up-to-date?
[0]
lee@dell:~/projects/linux/kernel [net-next]$ gcp 0cea4b05acd57..924e1f46aba5e
Auto-merging drivers/net/ethernet/smsc/smc91x.c
[net-next 19811db3120a2] net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
Date: Mon Oct 19 12:47:11 2020 +0100
1 file changed, 1 insertion(+), 1 deletion(-)
[net-next dc6f4490cb64e] net: xen-netback: xenbus: Demote nonconformant kernel-doc headers
Date: Tue Oct 20 08:00:43 2020 +0100
1 file changed, 2 insertions(+), 2 deletions(-)
[net-next a3363cb09ae59] net: ethernet: ti: am65-cpsw-qos: Demote non-conformant function header
Date: Tue Oct 20 09:05:38 2020 +0100
1 file changed, 1 insertion(+), 1 deletion(-)
[net-next 005462f886c3e] net: ethernet: ti: am65-cpts: Document am65_cpts_rx_enable()'s 'en' parameter
Date: Tue Oct 20 09:06:57 2020 +0100
1 file changed, 1 insertion(+), 1 deletion(-)
Auto-merging drivers/net/xen-netfront.c
[net-next 9fcc32e395e09] net: ethernet: ibm: ibmvnic: Fix some kernel-doc misdemeanours
Date: Tue Oct 20 09:42:19 2020 +0100
2 files changed, 16 insertions(+), 17 deletions(-)
[net-next 15ba865fef481] net: ethernet: toshiba: ps3_gelic_net: Fix some kernel-doc misdemeanours
Date: Tue Oct 20 10:10:14 2020 +0100
1 file changed, 5 insertions(+), 3 deletions(-)
[net-next f815eb7cbd7f5] net: ethernet: toshiba: spider_net: Document a whole bunch of function parameters
Date: Tue Oct 20 10:18:21 2020 +0100
1 file changed, 11 insertions(+), 7 deletions(-)
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote:
quoted
On Wed, 13 Jan 2021, Jakub Kicinski wrote:
quoted
On Wed, 13 Jan 2021 16:41:16 +0000 Lee Jones wrote:
quoted
Resending the stragglers again.
This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.
v2:
- Squashed IBM patches
- Fixed real issue in SMSC
- Added Andrew's Reviewed-by tags on remainder
Does not apply, please rebase on net-next/master.
These are based on Tuesday's next/master.
What's next/master?
I'm not sure if this is a joke, or not? :)
next/master == Linux Next. The daily merged repo where all of the
*-next branches end up to ensure interoperability. It's also the
branch that is most heavily tested by the auto-builders to ensure the
vast majority of issues are ironed out before hitting Mainline.
Looks like net-next gets merged into next/master:
commit 452958f1f3d1c8980a8414f9c37c8c6de24c7d32
Merge: 1eabba209a17a f50e2f9f79164
Author: Stephen Rothwell [off-list ref]
Date: Thu Jan 14 10:35:40 2021 +1100
Merge remote-tracking branch 'net-next/master'
So I'm not sure what it's conflicting with.
Do you have patches in net-next that didn't make it into next/master
for some reason?
I'll try to rebase again tomorrow.
Hopefully I am able to reproduce your issue by then.
Okay so my development branch rebased again with no issue.
Rebasing is not same as patches application.
I also took the liberty to checkout net-next and cherry-pick the
patches [0], which again didn't cause a problem.
Also normal, cherry-picking is not the same as applying a patch series.
I'm not sure what else to suggest. Is your local copy up-to-date?
I guess so, I have the same problem as Jakub, see below. I had to use 'git am -3' to apply you
series. As you can see, git falls back to 3 way merge for patch 1, which means your series is close
to but not fully in sync with net-next.
[root@localhost linux-powerpc]# git remote -v
net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git (fetch)
net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git (push)
[root@localhost linux-powerpc]# git checkout net-next/master -b net-next
Switched to a new branch 'net-next'
[root@localhost linux-powerpc]# git am /root/Downloads/Rid-W-1-warnings-in-Ethernet.patch
Applying: net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
error: patch failed: drivers/net/ethernet/smsc/smc91x.c:2192
error: drivers/net/ethernet/smsc/smc91x.c: patch does not apply
Patch failed at 0001 net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
[root@localhost linux-powerpc]# git am --abort
[root@localhost linux-powerpc]# git am -3 /root/Downloads/Rid-W-1-warnings-in-Ethernet.patch
Applying: net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
Using index info to reconstruct a base tree...
M drivers/net/ethernet/smsc/smc91x.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ethernet/smsc/smc91x.c
Applying: net: xen-netback: xenbus: Demote nonconformant kernel-doc headers
Applying: net: ethernet: ti: am65-cpsw-qos: Demote non-conformant function header
Applying: net: ethernet: ti: am65-cpts: Document am65_cpts_rx_enable()'s 'en' parameter
Applying: net: ethernet: ibm: ibmvnic: Fix some kernel-doc misdemeanours
Applying: net: ethernet: toshiba: ps3_gelic_net: Fix some kernel-doc misdemeanours
Applying: net: ethernet: toshiba: spider_net: Document a whole bunch of function parameters
Christophe
From: Lee Jones <hidden> Date: 2021-01-15 13:39:35
On Fri, 15 Jan 2021, Christophe Leroy wrote:
Le 15/01/2021 à 12:18, Lee Jones a écrit :
quoted
On Thu, 14 Jan 2021, Lee Jones wrote:
quoted
On Thu, 14 Jan 2021, Jakub Kicinski wrote:
quoted
On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote:
quoted
On Wed, 13 Jan 2021, Jakub Kicinski wrote:
quoted
On Wed, 13 Jan 2021 16:41:16 +0000 Lee Jones wrote:
quoted
Resending the stragglers again.
This set is part of a larger effort attempting to clean-up W=1
kernel builds, which are currently overwhelmingly riddled with
niggly little warnings.
v2:
- Squashed IBM patches
- Fixed real issue in SMSC
- Added Andrew's Reviewed-by tags on remainder
Does not apply, please rebase on net-next/master.
These are based on Tuesday's next/master.
What's next/master?
I'm not sure if this is a joke, or not? :)
next/master == Linux Next. The daily merged repo where all of the
*-next branches end up to ensure interoperability. It's also the
branch that is most heavily tested by the auto-builders to ensure the
vast majority of issues are ironed out before hitting Mainline.
Looks like net-next gets merged into next/master:
commit 452958f1f3d1c8980a8414f9c37c8c6de24c7d32
Merge: 1eabba209a17a f50e2f9f79164
Author: Stephen Rothwell [off-list ref]
Date: Thu Jan 14 10:35:40 2021 +1100
Merge remote-tracking branch 'net-next/master'
So I'm not sure what it's conflicting with.
Do you have patches in net-next that didn't make it into next/master
for some reason?
I'll try to rebase again tomorrow.
Hopefully I am able to reproduce your issue by then.
Okay so my development branch rebased again with no issue.
Rebasing is not same as patches application.
quoted
I also took the liberty to checkout net-next and cherry-pick the
patches [0], which again didn't cause a problem.
Also normal, cherry-picking is not the same as applying a patch series.
quoted
I'm not sure what else to suggest. Is your local copy up-to-date?
I guess so, I have the same problem as Jakub, see below. I had to use 'git
am -3' to apply you series. As you can see, git falls back to 3 way merge
for patch 1, which means your series is close to but not fully in sync with
net-next.
[root@localhost linux-powerpc]# git remote -v
net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git (fetch)
net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git (push)
[root@localhost linux-powerpc]# git checkout net-next/master -b net-next
Switched to a new branch 'net-next'
[root@localhost linux-powerpc]# git am /root/Downloads/Rid-W-1-warnings-in-Ethernet.patch
Applying: net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
error: patch failed: drivers/net/ethernet/smsc/smc91x.c:2192
error: drivers/net/ethernet/smsc/smc91x.c: patch does not apply
Patch failed at 0001 net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
hint: Use 'git am --show-current-patch' to see the failed patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
[root@localhost linux-powerpc]# git am --abort
[root@localhost linux-powerpc]# git am -3 /root/Downloads/Rid-W-1-warnings-in-Ethernet.patch
Applying: net: ethernet: smsc: smc91x: Fix function name in kernel-doc header
Using index info to reconstruct a base tree...
M drivers/net/ethernet/smsc/smc91x.c
Falling back to patching base and 3-way merge...
Auto-merging drivers/net/ethernet/smsc/smc91x.c
Applying: net: xen-netback: xenbus: Demote nonconformant kernel-doc headers
Applying: net: ethernet: ti: am65-cpsw-qos: Demote non-conformant function header
Applying: net: ethernet: ti: am65-cpts: Document am65_cpts_rx_enable()'s 'en' parameter
Applying: net: ethernet: ibm: ibmvnic: Fix some kernel-doc misdemeanours
Applying: net: ethernet: toshiba: ps3_gelic_net: Fix some kernel-doc misdemeanours
Applying: net: ethernet: toshiba: spider_net: Document a whole bunch of function parameters
Seeing as you went to all that effort, I thought it was only fair that
I did the same. After some digging my tentative conclusion is that
Linux -next is up-to-date with net-next, but net-next is not
up-to-date with Linux -next.
I think this patch is conflicting:
smc91x: remove GPIOLIB dependency.
Was that taken in via another tree? If not resolved there is a chance
that this may cause a conflict when net-next is merged into Mainline.
..
Okay, so what would you like me to do? Would you like me to re-submit
the set based only on net-next, or are you happy with your 3-way
merge?
I'll do as you ask.
--
Lee Jones [李琼斯]
Senior Technical Lead - Developer Services
Linaro.org │ Open source software for Arm SoCs
Follow Linaro: Facebook | Twitter | Blog
From: Jakub Kicinski <kuba@kernel.org> Date: 2021-01-15 16:57:46
On Fri, 15 Jan 2021 13:38:48 +0000 Lee Jones wrote:
Okay, so what would you like me to do? Would you like me to re-submit
the set based only on net-next
Yes, rebase your patches on net-next, recheck everything builds okay
and resubmit. You should always develop against the tree that will
merge your patches. I appreciate for your janitorial work using
linux-next is more expedient, but as you can see it causes trouble,
this is not the first time your patches don't apply to net-next IIRC.