Re: [net-next PATCH v2 0/9] Multiple cleanup and feature for qca8k
From: Vladimir Oltean <olteanv@gmail.com>
Date: 2021-11-22 01:56:21
Also in:
lkml
On Mon, Nov 22, 2021 at 02:43:46AM +0100, Ansuel Smith wrote:
On Mon, Nov 22, 2021 at 03:29:10AM +0200, Vladimir Oltean wrote:quoted
On Mon, Nov 22, 2021 at 02:03:04AM +0100, Ansuel Smith wrote:quoted
This is a reduced version of the old massive series. Refer to the changelog to know what is removed from this. THIS IS BASED ON net-next WITH THE 2 FIXES FROM net ALREADY REVIEWED net: dsa: qca8k: fix MTU calculation net: dsa: qca8k: fix internal delay applied to the wrong PAD configSince patchwork has auto build hooks now, it doesn't detect dependencies to other trees like "net" in this case, and your patches will fail to apply without the other ones you've mentioned, which in turn will make the builds fail. Patches without clean build reports aren't accepted, so you'll have to resend either way. Your options are: (a) wait until the bugfix patches get applied to "net", and Jakub and/or David send the networking pull request for v5.16-rc3 to Linus, then they'll merge the "net" tree into "net-next" quickly afterwards and your patches apply cleanly. Last two "net" pull requests were submitted on Nov 18th and 12th, if that is any indication as to when the next one is going to be. (b) base your patches on "net-next" without the bug fixes, and let Jakub/David handle the merge conflict when the'll merge "net" into "net-next" next time. Please note that if you do this, there is a small chance that mistakes can be made, and you can't easily backport patches to a stable tree such as OpenWRT if that's what you're into, since part of the delta will be in a merge commit, and there isn't any simple way in which you can linearize that during cherry-pick time, if you're picking from divergent branches.Mhhh I honestly think b option can be accepted here (due to the fact that fixes patch are very small) but the backport part can be problematic. Think it's better to just wait and get the reviewed by tag.
There is an option (c), which sometimes can be done and sometimes can't, which is to write the patches in such a way that they don't conflict with each other. I haven't checked what the exact conflicts are here, but that regmap conversion thing is pretty noisy, you're renaming every register read and write. Being more moderate about it can work to your advantage.
Is it problematic to add stuff to this series while the fixes are merged? (for example the LAGs or mirror part / the code split) Or having big series is still problematic even if half of the patch are already reviewed? Just asking if there is a way to continue the review process while we wait for the merge process.
You can always send RFC patches because for those, the build part isn't
so important, and there you can specifically ask for review tags and/or
point reviewers to other patch sets that they should apply first, were
they to review your submission by actually applying to a git tree and
not just from reading the patches in the email client.
I would still have multiple series of manageable sizes instead of a
monolithic one, just because it is conceptually easier to refer to them
("add qca8k support for X/Y/Z features" rather than "qca8k-misc-2021-11-22").