Re: [PATCH net-next v4 0/7] net: pse-pd: Add new PSE c33 features
From: Kory Maincent <kory.maincent@bootlin.com>
Date: 2024-06-26 07:52:22
Also in:
linux-doc, lkml
On Tue, 25 Jun 2024 18:41:44 -0700 Jakub Kicinski [off-list ref] wrote:
On Tue, 25 Jun 2024 14:33:45 +0200 Kory Maincent wrote: [...] Looks like we have a conflict on patch 6 now, please rebase
Ah indeed! In fact it conflicts because it is based on this patch which is merge mainline in net: https://lore.kernel.org/netdev/20240621130059.2147307-1-kory.maincent@bootlin.com/ (local) Do you know when and how often net-next is rebased on top of net? Sorry, I should have checked it before sending this version. Regards, -- Köry Maincent, Bootlin Embedded Linux and kernel engineering https://bootlin.com