[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20210611000915.ufp2db4qtv2vsjqb@skbuf>
Date: Fri, 11 Jun 2021 03:09:15 +0300
From: Vladimir Oltean <olteanv@...il.com>
To: David Miller <davem@...emloft.net>
Cc: kuba@...nel.org, netdev@...r.kernel.org, f.fainelli@...il.com,
andrew@...n.ch, vivien.didelot@...il.com, richardcochran@...il.com,
vladimir.oltean@....com
Subject: Re: [PATCH v2 net-next 00/10] DSA tagging driver for NXP SJA1110
On Thu, Jun 10, 2021 at 04:50:50PM -0700, David Miller wrote:
>
> Patch 9 no longer applies cleanly.
>
> Thank you.
Ah, that is because I also have the "Port the SJA1105 DSA driver to XPCS"
patches in my tree, and they are photobombing this series. With git rebase -i
they apply both ways, but git rebase has more context when applying than
git am, so I'm not in fact surprised that it fails, now that you mention it.
I could probably dodge that by moving some lines of code here and there
so they aren't near the XPCS changes, but I think I'll choose to not do
that, and instead let the people breathe a little, maybe take a look at
the patches as they are - if they want to apply them to a tree, that's
possible as well, sure, just apply the other series first - and then
resend tomorrow, or after the other patches are accepted.
Thanks and sorry for the trouble.
Powered by blists - more mailing lists