[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [PATCH v2 0/7] Rid W=1 warnings in Ethernet
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. > > 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
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |