Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet

[Christophe Leroy]

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@xxxxxxxxxxxxxxxx>
> > 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