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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAMRc=Mc8BxJ+8U3gs1yHX=a3ZFcfqn+Dke6Rz_LcAOeqT3Cjmw@mail.gmail.com>
Date: Sat, 6 Jul 2024 19:11:18 +0200
From: Bartosz Golaszewski <brgl@...ev.pl>
To: Jakub Kicinski <kuba@...nel.org>
Cc: Andrew Lunn <andrew@...n.ch>, Heiner Kallweit <hkallweit1@...il.com>, 
	Russell King <linux@...linux.org.uk>, "David S . Miller" <davem@...emloft.net>, 
	Eric Dumazet <edumazet@...gle.com>, Paolo Abeni <pabeni@...hat.com>, netdev@...r.kernel.org, 
	linux-kernel@...r.kernel.org, 
	Bartosz Golaszewski <bartosz.golaszewski@...aro.org>
Subject: Re: [PATCH net-next v3 0/4] net: phy: aquantia: enable support for aqr115c

On Sat, Jul 6, 2024 at 2:04 AM Jakub Kicinski <kuba@...nel.org> 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