Re: NFC for next-20260609
Jakub Kicinski <[email protected]> Thu, 11 Jun 2026 10:56:44 -0700
| Newsgroups | dev.linux.lists.oe-linux-nfc,org.kernel.vger.linux-kernel,org.kernel.vger.netdev |
|---|---|
| Message-ID | <[email protected]> |
On Thu, 11 Jun 2026 14:14:01 +0200 David Heidelberg wrote: > On 10/06/2026 17:48, Jakub Kicinski wrote: > > On Tue, 9 Jun 2026 10:45:21 +0200 David Heidelberg wrote: > >> The following changes since commit 4549871118cf616eecdd2d939f78e3b9e1dddc48: > >> > >> Linux 7.1-rc7 (2026-06-07 15:37:58 -0700) > > > > This should be based on net-next if you're sending a PR to net-next. > > > > Normal flow of history is something like: > > > > net-next - x - x - ... - x - merge - x - ... > > \ / \ > > `- x - x - x - x [PR] ` x - ... > > > > Note that net and net-next do the same dance of periodic merges, > > and net does a periodic dance with Linus's tree, which is how > > we get changes propagate from the tree with fixes to -next trees. > > > > Problem 2 - the subject says next but the tag says "nfc pull request > > for net:", which one is it? :) > > ^^^ > > > > Could you rebase the patches on top of net-next if that's your intended > > target or net if you meant net? > > So the batch was intended to go into 7.2, should I target net-next or directly > net in this case? Doesn't matter right now since the merge window is really close. But looks like a mix of fixes and improvements. Having patches that CC stable and basic code changes in one PR is a bit of a red flag. The fixes should should go to net, and the improvements to net-next. Right now probably best to respin for net-next, we don't want to have to take the non-urgent stuff via net at this stag.e