Message ID | 20240625-feature_poe_power_cap-v4-0-b0813aad57d5@bootlin.com (mailing list archive) |
---|---|
Headers | show |
Series | net: pse-pd: Add new PSE c33 features | expand |
On Tue, 25 Jun 2024 14:33:45 +0200 Kory Maincent wrote: > This patch series adds new c33 features to the PSE API. > - Expand the PSE PI informations status with power, class and failure > reason > - Add the possibility to get and set the PSE PIs power limit Looks like we have a conflict on patch 6 now, please rebase
On Tue, 25 Jun 2024 18:41:44 -0700 Jakub Kicinski <kuba@kernel.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,
On Wed, 26 Jun 2024 09:52:11 +0200 Kory Maincent wrote:
> Do you know when and how often net-next is rebased on top of net?
Every Thursday, usually around noon PST but exact timing depends on when
Linus pulls and how quickly I notice that he did :)
On Wed, 26 Jun 2024 06:27:11 -0700 Jakub Kicinski <kuba@kernel.org> wrote: > On Wed, 26 Jun 2024 09:52:11 +0200 Kory Maincent wrote: > [...] > > Every Thursday, usually around noon PST but exact timing depends on when > Linus pulls and how quickly I notice that he did :) Ok, thanks for the information! Regards,