Re: [PATCH v2 net-next 00/10] DSA tagging driver for NXP SJA1110

On Fri, Jun 11, 2021 at 03:09:15AM +0300, Vladimir Oltean wrote:

On Thu, Jun 10, 2021 at 04:50:50PM -0700, David Miller wrote:

quoted

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

Hi Vladimir

git am is very pedantic. It does not use fuzz. So just moving lines
within the same line is unlikely to work, you need to make the changes
in non intersecting sets of files.

Your best bet is to be patient and wait for one patchset to get
merged, and then submit the second patchset.

	Andrew