* [PATCH v2 0/7] Rid W=1 warnings in Ethernet @ 2021-01-13 16:41 Lee Jones 2021-01-13 16:41 ` [PATCH 5/7] net: ethernet: ibm: ibmvnic: Fix some kernel-doc misdemeanours Lee Jones ` (2 more replies) 0 siblings, 3 replies; 11+ messages in thread From: Lee Jones @ 2021-01-13 16:41 UTC (permalink / raw) To: lee.jones Cc: Paul Durrant, Kurt Kanzenbach, Alexei Starovoitov, Gustavo A. R. Silva, Peter Cammaert, Paul Mackerras, Sukadev Bhattiprolu, Wei Liu, Daniel Borkmann, John Fastabend, Santiago Leon, Jakub Kicinski, Grygorii Strashko, Thomas Falcon, Jesper Dangaard Brouer, Jens Osterkamp, Rusty Russell, Daris A Nevil, Lijun Pan, xen-devel, Ivan Khoronzhuk, Nicolas Pitre, Geoff Levand, netdev, linux-kernel, Erik Stahlman, John Allen, Utz Bacher, Dany Madden, bpf, linuxppc-dev, David S. Miller, Russell King 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 Lee Jones (7): net: ethernet: smsc: smc91x: Fix function name in kernel-doc header net: xen-netback: xenbus: Demote nonconformant kernel-doc headers net: ethernet: ti: am65-cpsw-qos: Demote non-conformant function header net: ethernet: ti: am65-cpts: Document am65_cpts_rx_enable()'s 'en' parameter net: ethernet: ibm: ibmvnic: Fix some kernel-doc misdemeanours net: ethernet: toshiba: ps3_gelic_net: Fix some kernel-doc misdemeanours net: ethernet: toshiba: spider_net: Document a whole bunch of function parameters drivers/net/ethernet/ibm/ibmvnic.c | 27 ++++++++++---------- drivers/net/ethernet/smsc/smc91x.c | 2 +- drivers/net/ethernet/ti/am65-cpsw-qos.c | 2 +- drivers/net/ethernet/ti/am65-cpts.c | 2 +- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 8 +++--- drivers/net/ethernet/toshiba/spider_net.c | 18 ++++++++----- drivers/net/xen-netback/xenbus.c | 4 +-- drivers/net/xen-netfront.c | 6 ++--- 8 files changed, 37 insertions(+), 32 deletions(-) Cc: Alexei Starovoitov <ast@kernel.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: bpf@vger.kernel.org Cc: Daniel Borkmann <daniel@iogearbox.net> Cc: Dany Madden <drt@linux.ibm.com> Cc: Daris A Nevil <dnevil@snmc.com> Cc: "David S. Miller" <davem@davemloft.net> Cc: Erik Stahlman <erik@vt.edu> Cc: Geoff Levand <geoff@infradead.org> Cc: Grygorii Strashko <grygorii.strashko@ti.com> Cc: "Gustavo A. R. Silva" <gustavoars@kernel.org> Cc: Ishizaki Kou <kou.ishizaki@toshiba.co.jp> Cc: Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Jens Osterkamp <Jens.Osterkamp@de.ibm.com> Cc: Jesper Dangaard Brouer <hawk@kernel.org> Cc: John Allen <jallen@linux.vnet.ibm.com> Cc: John Fastabend <john.fastabend@gmail.com> Cc: Kurt Kanzenbach <kurt@linutronix.de> Cc: Lijun Pan <ljp@linux.ibm.com> Cc: linuxppc-dev@lists.ozlabs.org Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: netdev@vger.kernel.org Cc: Nicolas Pitre <nico@fluxnic.net> Cc: Paul Durrant <paul@xen.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Cammaert <pc@denkart.be> Cc: Russell King <rmk@arm.linux.org.uk> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Santiago Leon <santi_leon@yahoo.com> Cc: Sukadev Bhattiprolu <sukadev@linux.ibm.com> Cc: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> Cc: Utz Bacher <utz.bacher@de.ibm.com> Cc: Wei Liu <wei.liu@kernel.org> Cc: xen-devel@lists.xenproject.org -- 2.25.1 ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 5/7] net: ethernet: ibm: ibmvnic: Fix some kernel-doc misdemeanours 2021-01-13 16:41 [PATCH v2 0/7] Rid W=1 warnings in Ethernet Lee Jones @ 2021-01-13 16:41 ` Lee Jones 2021-01-13 16:41 ` [PATCH 6/7] net: ethernet: toshiba: ps3_gelic_net: " Lee Jones 2021-01-14 2:35 ` [PATCH v2 0/7] Rid W=1 warnings in Ethernet Jakub Kicinski 2 siblings, 0 replies; 11+ messages in thread From: Lee Jones @ 2021-01-13 16:41 UTC (permalink / raw) To: lee.jones Cc: Thomas Falcon, John Allen, linux-kernel, Santiago Leon, Jakub Kicinski, netdev, Lijun Pan, Dany Madden, Paul Mackerras, Sukadev Bhattiprolu, linuxppc-dev, David S. Miller 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 <drt@linux.ibm.com> Cc: Lijun Pan <ljp@linux.ibm.com> Cc: Sukadev Bhattiprolu <sukadev@linux.ibm.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Paul Mackerras <paulus@samba.org> Cc: "David S. Miller" <davem@davemloft.net> Cc: Jakub Kicinski <kuba@kernel.org> Cc: Santiago Leon <santi_leon@yahoo.com> Cc: Thomas Falcon <tlfalcon@linux.vnet.ibm.com> Cc: John Allen <jallen@linux.vnet.ibm.com> Cc: netdev@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/net/ethernet/ibm/ibmvnic.c | 27 +++++++++++++-------------- drivers/net/xen-netfront.c | 6 +++--- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/drivers/net/ethernet/ibm/ibmvnic.c b/drivers/net/ethernet/ibm/ibmvnic.c index aed985e08e8ad..4c4252e68de5a 100644 --- a/drivers/net/ethernet/ibm/ibmvnic.c +++ b/drivers/net/ethernet/ibm/ibmvnic.c @@ -1384,10 +1384,10 @@ static int ibmvnic_close(struct net_device *netdev) /** * build_hdr_data - creates L2/L3/L4 header data buffer - * @hdr_field - bitfield determining needed headers - * @skb - socket buffer - * @hdr_len - array of header lengths - * @tot_len - total length of data + * @hdr_field: bitfield determining needed headers + * @skb: socket buffer + * @hdr_len: array of header lengths + * @hdr_data: buffer to write the header to * * Reads hdr_field to determine which headers are needed by firmware. * Builds a buffer containing these headers. Saves individual header @@ -1444,11 +1444,11 @@ static int build_hdr_data(u8 hdr_field, struct sk_buff *skb, /** * create_hdr_descs - create header and header extension descriptors - * @hdr_field - bitfield determining needed headers - * @data - buffer containing header data - * @len - length of data buffer - * @hdr_len - array of individual header lengths - * @scrq_arr - descriptor array + * @hdr_field: bitfield determining needed headers + * @hdr_data: buffer containing header data + * @len: length of data buffer + * @hdr_len: array of individual header lengths + * @scrq_arr: descriptor array * * Creates header and, if needed, header extension descriptors and * places them in a descriptor array, scrq_arr @@ -1496,10 +1496,9 @@ static int create_hdr_descs(u8 hdr_field, u8 *hdr_data, int len, int *hdr_len, /** * build_hdr_descs_arr - build a header descriptor array - * @skb - socket buffer - * @num_entries - number of descriptors to be sent - * @subcrq - first TX descriptor - * @hdr_field - bit field determining which headers will be sent + * @txbuff: tx buffer + * @num_entries: number of descriptors to be sent + * @hdr_field: bit field determining which headers will be sent * * This function will build a TX descriptor array with applicable * L2/L3/L4 packet header descriptors to be sent by send_subcrq_indirect. @@ -1925,7 +1924,7 @@ static int ibmvnic_set_mac(struct net_device *netdev, void *p) return rc; } -/** +/* * do_reset returns zero if we are able to keep processing reset events, or * non-zero if we hit a fatal error and must halt. */ diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index c20b78120bb42..6ef2adbd283a3 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1580,7 +1580,7 @@ static struct net_device *xennet_create_dev(struct xenbus_device *dev) return ERR_PTR(err); } -/** +/* * Entry point to this code when a new device is created. Allocate the basic * structures and the ring buffers for communication with the backend, and * inform the backend of the appropriate details for those. @@ -1657,7 +1657,7 @@ static void xennet_disconnect_backend(struct netfront_info *info) } } -/** +/* * We are reconnecting to the backend, due to a suspend/resume, or a backend * driver restart. We tear down our netif structure and recreate it, but * leave the device-layer structures intact so that this is transparent to the @@ -2303,7 +2303,7 @@ static int xennet_connect(struct net_device *dev) return 0; } -/** +/* * Callback received when the backend's state changes. */ static void netback_changed(struct xenbus_device *dev, -- 2.25.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH 6/7] net: ethernet: toshiba: ps3_gelic_net: Fix some kernel-doc misdemeanours 2021-01-13 16:41 [PATCH v2 0/7] Rid W=1 warnings in Ethernet Lee Jones 2021-01-13 16:41 ` [PATCH 5/7] net: ethernet: ibm: ibmvnic: Fix some kernel-doc misdemeanours Lee Jones @ 2021-01-13 16:41 ` Lee Jones 2021-01-14 2:35 ` [PATCH v2 0/7] Rid W=1 warnings in Ethernet Jakub Kicinski 2 siblings, 0 replies; 11+ messages in thread From: Lee Jones @ 2021-01-13 16:41 UTC (permalink / raw) To: lee.jones Cc: Andrew Lunn, Geoff Levand, linux-kernel, Jens Osterkamp, netdev, Paul Mackerras, Utz Bacher, Jakub Kicinski, linuxppc-dev, David S. Miller 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 <paulus@samba.org> Cc: Utz Bacher <utz.bacher@de.ibm.com> Cc: Jens Osterkamp <Jens.Osterkamp@de.ibm.com> Cc: netdev@vger.kernel.org Cc: linuxppc-dev@lists.ozlabs.org Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/net/ethernet/toshiba/ps3_gelic_net.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/toshiba/ps3_gelic_net.c b/drivers/net/ethernet/toshiba/ps3_gelic_net.c index 3d1fc8d2ca667..55e652624bd76 100644 --- a/drivers/net/ethernet/toshiba/ps3_gelic_net.c +++ b/drivers/net/ethernet/toshiba/ps3_gelic_net.c @@ -1100,7 +1100,7 @@ static int gelic_net_poll(struct napi_struct *napi, int budget) return packets_done; } -/** +/* * gelic_card_interrupt - event handler for gelic_net */ static irqreturn_t gelic_card_interrupt(int irq, void *ptr) @@ -1400,6 +1400,7 @@ static void gelic_net_tx_timeout_task(struct work_struct *work) /** * gelic_net_tx_timeout - called when the tx timeout watchdog kicks in. * @netdev: interface device structure + * @txqueue: unused * * called, if tx hangs. Schedules a task that resets the interface */ @@ -1431,6 +1432,7 @@ static const struct net_device_ops gelic_netdevice_ops = { /** * gelic_ether_setup_netdev_ops - initialization of net_device operations * @netdev: net_device structure + * @napi: napi structure * * fills out function pointers in the net_device structure */ @@ -1632,7 +1634,7 @@ static void gelic_card_get_vlan_info(struct gelic_card *card) dev_info(ctodev(card), "internal vlan %s\n", card->vlan_required? "enabled" : "disabled"); } -/** +/* * ps3_gelic_driver_probe - add a device to the control of this driver */ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) @@ -1787,7 +1789,7 @@ static int ps3_gelic_driver_probe(struct ps3_system_bus_device *dev) return result; } -/** +/* * ps3_gelic_driver_remove - remove a device from the control of this driver */ -- 2.25.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet 2021-01-13 16:41 [PATCH v2 0/7] Rid W=1 warnings in Ethernet Lee Jones 2021-01-13 16:41 ` [PATCH 5/7] net: ethernet: ibm: ibmvnic: Fix some kernel-doc misdemeanours Lee Jones 2021-01-13 16:41 ` [PATCH 6/7] net: ethernet: toshiba: ps3_gelic_net: " Lee Jones @ 2021-01-14 2:35 ` Jakub Kicinski 2021-01-14 8:33 ` Lee Jones 2 siblings, 1 reply; 11+ messages in thread From: Jakub Kicinski @ 2021-01-14 2:35 UTC (permalink / raw) To: Lee Jones Cc: Paul Durrant, Kurt Kanzenbach, Alexei Starovoitov, Gustavo A. R. Silva, Peter Cammaert, Paul Mackerras, Sukadev Bhattiprolu, Wei Liu, Daniel Borkmann, John Fastabend, Santiago Leon, xen-devel, Grygorii Strashko, Thomas Falcon, Jesper Dangaard Brouer, Jens Osterkamp, Rusty Russell, Daris A Nevil, Lijun Pan, Ivan Khoronzhuk, Nicolas Pitre, Geoff Levand, netdev, linux-kernel, Erik Stahlman, John Allen, Utz Bacher, Dany Madden, bpf, linuxppc-dev, David S. Miller, Russell King 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 Does not apply, please rebase on net-next/master. ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet 2021-01-14 2:35 ` [PATCH v2 0/7] Rid W=1 warnings in Ethernet Jakub Kicinski @ 2021-01-14 8:33 ` Lee Jones 2021-01-14 17:14 ` Jakub Kicinski 0 siblings, 1 reply; 11+ messages in thread From: Lee Jones @ 2021-01-14 8:33 UTC (permalink / raw) To: Jakub Kicinski Cc: Paul Durrant, Kurt Kanzenbach, Alexei Starovoitov, Gustavo A. R. Silva, Peter Cammaert, Paul Mackerras, Sukadev Bhattiprolu, Wei Liu, Daniel Borkmann, John Fastabend, Santiago Leon, xen-devel, Grygorii Strashko, Thomas Falcon, Jesper Dangaard Brouer, Jens Osterkamp, Rusty Russell, Daris A Nevil, Lijun Pan, Ivan Khoronzhuk, Nicolas Pitre, Geoff Levand, netdev, linux-kernel, Erik Stahlman, John Allen, Utz Bacher, Dany Madden, bpf, linuxppc-dev, David S. Miller, Russell King On Wed, 13 Jan 2021, Jakub Kicinski wrote: > 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 > > 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet 2021-01-14 8:33 ` Lee Jones @ 2021-01-14 17:14 ` Jakub Kicinski 2021-01-14 19:54 ` Lee Jones 0 siblings, 1 reply; 11+ messages in thread From: Jakub Kicinski @ 2021-01-14 17:14 UTC (permalink / raw) To: Lee Jones Cc: Paul Durrant, Kurt Kanzenbach, Alexei Starovoitov, Gustavo A. R. Silva, Peter Cammaert, Paul Mackerras, Sukadev Bhattiprolu, Wei Liu, Daniel Borkmann, John Fastabend, Santiago Leon, xen-devel, Grygorii Strashko, Thomas Falcon, Jesper Dangaard Brouer, Jens Osterkamp, Rusty Russell, Daris A Nevil, Lijun Pan, Ivan Khoronzhuk, Nicolas Pitre, Geoff Levand, netdev, linux-kernel, Erik Stahlman, John Allen, Utz Bacher, Dany Madden, bpf, linuxppc-dev, David S. Miller, Russell King On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote: > On Wed, 13 Jan 2021, Jakub Kicinski wrote: > > > 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 > > > > Does not apply, please rebase on net-next/master. > > These are based on Tuesday's next/master. What's next/master? This is net-next: https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/ > 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". ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet 2021-01-14 17:14 ` Jakub Kicinski @ 2021-01-14 19:54 ` Lee Jones 2021-01-15 11:18 ` Lee Jones 0 siblings, 1 reply; 11+ messages in thread From: Lee Jones @ 2021-01-14 19:54 UTC (permalink / raw) To: Jakub Kicinski Cc: Paul Durrant, Kurt Kanzenbach, Alexei Starovoitov, Gustavo A. R. Silva, Peter Cammaert, Paul Mackerras, Sukadev Bhattiprolu, Wei Liu, Daniel Borkmann, John Fastabend, Santiago Leon, xen-devel, Grygorii Strashko, Thomas Falcon, Jesper Dangaard Brouer, Jens Osterkamp, Rusty Russell, Daris A Nevil, Lijun Pan, Ivan Khoronzhuk, Nicolas Pitre, Geoff Levand, netdev, linux-kernel, Erik Stahlman, John Allen, Utz Bacher, Dany Madden, bpf, linuxppc-dev, David S. Miller, Russell King On Thu, 14 Jan 2021, Jakub Kicinski wrote: > On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote: > > On Wed, 13 Jan 2021, Jakub Kicinski wrote: > > > > > 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 > > > > > > 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. > This is net-next: > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/ Looks like net-next gets merged into next/master: commit 452958f1f3d1c8980a8414f9c37c8c6de24c7d32 Merge: 1eabba209a17a f50e2f9f79164 Author: Stephen Rothwell <sfr@canb.auug.org.au> 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. > > 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet 2021-01-14 19:54 ` Lee Jones @ 2021-01-15 11:18 ` Lee Jones 2021-01-15 13:14 ` Christophe Leroy 0 siblings, 1 reply; 11+ messages in thread From: Lee Jones @ 2021-01-15 11:18 UTC (permalink / raw) To: Jakub Kicinski Cc: Paul Durrant, Kurt Kanzenbach, Alexei Starovoitov, Gustavo A. R. Silva, Peter Cammaert, Paul Mackerras, Sukadev Bhattiprolu, Wei Liu, Daniel Borkmann, John Fastabend, Santiago Leon, xen-devel, Grygorii Strashko, Thomas Falcon, Jesper Dangaard Brouer, Jens Osterkamp, Rusty Russell, Daris A Nevil, Lijun Pan, Ivan Khoronzhuk, Nicolas Pitre, Geoff Levand, netdev, linux-kernel, Erik Stahlman, John Allen, Utz Bacher, Dany Madden, bpf, linuxppc-dev, David S. Miller, Russell King On Thu, 14 Jan 2021, Lee Jones wrote: > On Thu, 14 Jan 2021, Jakub Kicinski wrote: > > > On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote: > > > On Wed, 13 Jan 2021, Jakub Kicinski wrote: > > > > > > > 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 > > > > > > > > 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. > > > This is net-next: > > > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/ > > Looks like net-next gets merged into next/master: > > commit 452958f1f3d1c8980a8414f9c37c8c6de24c7d32 > Merge: 1eabba209a17a f50e2f9f79164 > Author: Stephen Rothwell <sfr@canb.auug.org.au> > 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet 2021-01-15 11:18 ` Lee Jones @ 2021-01-15 13:14 ` Christophe Leroy 2021-01-15 13:38 ` Lee Jones 0 siblings, 1 reply; 11+ messages in thread From: Christophe Leroy @ 2021-01-15 13:14 UTC (permalink / raw) To: Lee Jones, Jakub Kicinski Cc: Paul Durrant, Kurt Kanzenbach, Alexei Starovoitov, linux-kernel, Peter Cammaert, Paul Mackerras, Sukadev Bhattiprolu, Wei Liu, Daniel Borkmann, Utz Bacher, John Fastabend, Santiago Leon, xen-devel, Grygorii Strashko, Thomas Falcon, Jesper Dangaard Brouer, Jens Osterkamp, Rusty Russell, Daris A Nevil, Lijun Pan, Ivan Khoronzhuk, Nicolas Pitre, Geoff Levand, netdev, Gustavo A. R. Silva, Erik Stahlman, John Allen, Dany Madden, bpf, linuxppc-dev, David S. Miller, Russell King Le 15/01/2021 à 12:18, Lee Jones a écrit : > On Thu, 14 Jan 2021, Lee Jones wrote: > >> On Thu, 14 Jan 2021, Jakub Kicinski wrote: >> >>> On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote: >>>> On Wed, 13 Jan 2021, Jakub Kicinski wrote: >>>> >>>>> 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 >>>>> >>>>> 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. >> >>> This is net-next: >>> >>> https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/ >> >> Looks like net-next gets merged into next/master: >> >> commit 452958f1f3d1c8980a8414f9c37c8c6de24c7d32 >> Merge: 1eabba209a17a f50e2f9f79164 >> Author: Stephen Rothwell <sfr@canb.auug.org.au> >> 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet 2021-01-15 13:14 ` Christophe Leroy @ 2021-01-15 13:38 ` Lee Jones 2021-01-15 16:56 ` Jakub Kicinski 0 siblings, 1 reply; 11+ messages in thread From: Lee Jones @ 2021-01-15 13:38 UTC (permalink / raw) To: Christophe Leroy Cc: Paul Durrant, Kurt Kanzenbach, Alexei Starovoitov, linux-kernel, Peter Cammaert, Paul Mackerras, Sukadev Bhattiprolu, Wei Liu, Daniel Borkmann, Utz Bacher, John Fastabend, Santiago Leon, xen-devel, Grygorii Strashko, Thomas Falcon, Jesper Dangaard Brouer, Jens Osterkamp, Rusty Russell, Daris A Nevil, Lijun Pan, Jakub Kicinski, Ivan Khoronzhuk, Nicolas Pitre, Geoff Levand, netdev, Gustavo A. R. Silva, Erik Stahlman, John Allen, Dany Madden, bpf, linuxppc-dev, David S. Miller, Russell King On Fri, 15 Jan 2021, Christophe Leroy wrote: > > > Le 15/01/2021 à 12:18, Lee Jones a écrit : > > On Thu, 14 Jan 2021, Lee Jones wrote: > > > > > On Thu, 14 Jan 2021, Jakub Kicinski wrote: > > > > > > > On Thu, 14 Jan 2021 08:33:49 +0000 Lee Jones wrote: > > > > > On Wed, 13 Jan 2021, Jakub Kicinski wrote: > > > > > > > > > > > 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 > > > > > > > > > > > > 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. > > > > > > > This is net-next: > > > > > > > > https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git/ > > > > > > Looks like net-next gets merged into next/master: > > > > > > commit 452958f1f3d1c8980a8414f9c37c8c6de24c7d32 > > > Merge: 1eabba209a17a f50e2f9f79164 > > > Author: Stephen Rothwell <sfr@canb.auug.org.au> > > > 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 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 ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet 2021-01-15 13:38 ` Lee Jones @ 2021-01-15 16:56 ` Jakub Kicinski 0 siblings, 0 replies; 11+ messages in thread From: Jakub Kicinski @ 2021-01-15 16:56 UTC (permalink / raw) To: Lee Jones Cc: Paul Durrant, Kurt Kanzenbach, Alexei Starovoitov, linux-kernel, Peter Cammaert, Paul Mackerras, Sukadev Bhattiprolu, Wei Liu, Daniel Borkmann, Utz Bacher, John Fastabend, Santiago Leon, xen-devel, Grygorii Strashko, Thomas Falcon, Jesper Dangaard Brouer, Jens Osterkamp, Rusty Russell, Daris A Nevil, Lijun Pan, Ivan Khoronzhuk, Nicolas Pitre, Geoff Levand, netdev, Gustavo A. R. Silva, Erik Stahlman, John Allen, Dany Madden, bpf, linuxppc-dev, David S. Miller, Russell King 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. ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2021-01-15 18:34 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-01-13 16:41 [PATCH v2 0/7] Rid W=1 warnings in Ethernet Lee Jones 2021-01-13 16:41 ` [PATCH 5/7] net: ethernet: ibm: ibmvnic: Fix some kernel-doc misdemeanours Lee Jones 2021-01-13 16:41 ` [PATCH 6/7] net: ethernet: toshiba: ps3_gelic_net: " Lee Jones 2021-01-14 2:35 ` [PATCH v2 0/7] Rid W=1 warnings in Ethernet Jakub Kicinski 2021-01-14 8:33 ` Lee Jones 2021-01-14 17:14 ` Jakub Kicinski 2021-01-14 19:54 ` Lee Jones 2021-01-15 11:18 ` Lee Jones 2021-01-15 13:14 ` Christophe Leroy 2021-01-15 13:38 ` Lee Jones 2021-01-15 16:56 ` Jakub Kicinski
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).