From: Lee Jones <lee.jones@linaro.org>
To: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Jakub Kicinski <kuba@kernel.org>, Paul Durrant <paul@xen.org>,
Kurt Kanzenbach <kurt@linutronix.de>,
Alexei Starovoitov <ast@kernel.org>,
"Gustavo A. R. Silva" <gustavoars@kernel.org>,
Peter Cammaert <pc@denkart.be>, Paul Mackerras <paulus@samba.org>,
Sukadev Bhattiprolu <sukadev@linux.ibm.com>,
Wei Liu <wei.liu@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
John Fastabend <john.fastabend@gmail.com>,
Santiago Leon <santi_leon@yahoo.com>,
xen-devel@lists.xenproject.org,
Grygorii Strashko <grygorii.strashko@ti.com>,
Thomas Falcon <tlfalcon@linux.vnet.ibm.com>,
Jesper Dangaard Brouer <hawk@kernel.org>,
Jens Osterkamp <Jens.Osterkamp@de.ibm.com>,
Rusty Russell <rusty@rustcorp.com.au>,
Daris A Nevil <dnevil@snmc.com>, Lijun Pan <ljp@linux.ibm.com>,
Ivan Khoronzhuk <ivan.khoronzhuk@linaro.org>,
Nicolas Pitre <nico@fluxnic.net>,
Geoff Levand <geoff@infradead.org>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Erik Stahlman <erik@vt.edu>,
John Allen <jallen@linux.vnet.ibm.com>,
Utz Bacher <utz.bacher@de.ibm.com>,
Dany Madden <drt@linux.ibm.com>,
bpf@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
"David S. Miller" <davem@davemloft.net>,
Russell King <rmk@arm.linux.org.uk>
Subject: Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet
Date: Fri, 15 Jan 2021 13:38:48 +0000 [thread overview]
Message-ID: <20210115133848.GK3975472@dell> (raw)
In-Reply-To: <bc775cc3-fda3-0280-5f92-53058996f02f@csgroup.eu>
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
next prev parent reply other threads:[~2021-01-15 13:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 16:41 [PATCH v2 0/7] Rid W=1 warnings in Ethernet Lee Jones
2021-01-13 16:41 ` [PATCH 1/7] net: ethernet: smsc: smc91x: Fix function name in kernel-doc header Lee Jones
2021-01-13 16:41 ` [PATCH 2/7] net: xen-netback: xenbus: Demote nonconformant kernel-doc headers Lee Jones
2021-01-13 16:41 ` [PATCH 3/7] net: ethernet: ti: am65-cpsw-qos: Demote non-conformant function header Lee Jones
2021-01-13 16:41 ` [PATCH 4/7] net: ethernet: ti: am65-cpts: Document am65_cpts_rx_enable()'s 'en' parameter 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-13 16:41 ` [PATCH 7/7] net: ethernet: toshiba: spider_net: Document a whole bunch of function parameters 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 [this message]
2021-01-15 16:56 ` Jakub Kicinski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210115133848.GK3975472@dell \
--to=lee.jones@linaro.org \
--cc=Jens.Osterkamp@de.ibm.com \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=daniel@iogearbox.net \
--cc=davem@davemloft.net \
--cc=dnevil@snmc.com \
--cc=drt@linux.ibm.com \
--cc=erik@vt.edu \
--cc=geoff@infradead.org \
--cc=grygorii.strashko@ti.com \
--cc=gustavoars@kernel.org \
--cc=hawk@kernel.org \
--cc=ivan.khoronzhuk@linaro.org \
--cc=jallen@linux.vnet.ibm.com \
--cc=john.fastabend@gmail.com \
--cc=kuba@kernel.org \
--cc=kurt@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=ljp@linux.ibm.com \
--cc=netdev@vger.kernel.org \
--cc=nico@fluxnic.net \
--cc=paul@xen.org \
--cc=paulus@samba.org \
--cc=pc@denkart.be \
--cc=rmk@arm.linux.org.uk \
--cc=rusty@rustcorp.com.au \
--cc=santi_leon@yahoo.com \
--cc=sukadev@linux.ibm.com \
--cc=tlfalcon@linux.vnet.ibm.com \
--cc=utz.bacher@de.ibm.com \
--cc=wei.liu@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).