| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Date: Wed, 26 Jun 2024 09:52:11 +0200 From: Kory Maincent <kory.maincent@...tlin.com> To: Jakub Kicinski <kuba@...nel.org> Cc: "David S. Miller" <davem@...emloft.net>, Eric Dumazet <edumazet@...gle.com>, Paolo Abeni <pabeni@...hat.com>, Donald Hunter <donald.hunter@...il.com>, Oleksij Rempel <o.rempel@...gutronix.de>, Jonathan Corbet <corbet@....net>, Thomas Petazzoni <thomas.petazzoni@...tlin.com>, linux-kernel@...r.kernel.org, netdev@...r.kernel.org, Dent Project <dentproject@...uxfoundation.org>, kernel@...gutronix.de, linux-doc@...r.kernel.org Subject: Re: [PATCH net-next v4 0/7] net: pse-pd: Add new PSE c33 features On Tue, 25 Jun 2024 18:41:44 -0700 Jakub Kicinski <kuba@...nel.org> 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/ 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
Powered by blists - more mailing lists