Re: [PATCH net-next v3 0/4] net: phy: aquantia: enable support for aqr115c

[Bartosz Golaszewski]

On Sat, Jul 6, 2024 at 7:11 PM Bartosz Golaszewski <brgl@xxxxxxxx> wrote:
>
> On Sat, Jul 6, 2024 at 2:04 AM Jakub Kicinski <kuba@xxxxxxxxxx> wrote:
> >
> > On Wed,  3 Jul 2024 20:11:27 +0200 Bartosz Golaszewski wrote:
> > > [PATCH net-next v3 0/4] net: phy: aquantia: enable support for aqr115c
> >
> > Doesn't seem to apply:
> >
> > Applying: net: phy: aquantia: rename and export aqr107_wait_reset_complete()
> > error: patch failed: drivers/net/phy/aquantia/aquantia.h:201
> > error: drivers/net/phy/aquantia/aquantia.h: patch does not apply
> > Patch failed at 0001 net: phy: aquantia: rename and export aqr107_wait_reset_complete()
> > hint: Use 'git am --show-current-patch=diff' to see the failed patch
> > hint: When you have resolved this problem, run "git am --continue".
> > hint: If you prefer to skip this patch, run "git am --skip" instead.
> > hint: To restore the original branch and stop patching, run "git am --abort".
> > hint: Disable this message with "git config advice.mergeConflict false"
> > --
> > pw-bot: cr
>
> It conflicts with the fix I sent separately to add include guards that
> I had in my branch as well. I'll resend it.
>
> Bart

Actually this conflicts with commit 61578f679378 ("net: phy: aquantia:
add support for PHY LEDs") that was applied to net-next recently. The
resolution is trivial - just leave both sides as they are. Can you
resolve it when applying or do you want a new version after all?

Bart