Messages in this thread | | | Date | Mon, 22 Nov 2021 03:29:10 +0200 | From | Vladimir Oltean <> | Subject | Re: [net-next PATCH v2 0/9] Multiple cleanup and feature for qca8k |
| |
On Mon, Nov 22, 2021 at 02:03:04AM +0100, Ansuel Smith wrote: > 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 config
Since 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.
| |