Hey Lee Jones, On 24.04.2023 10:02:29, Lee Jones wrote: > On Sun, 23 Apr 2023, Dario Binacchi wrote: > > > Add binding definition for CAN3 peripheral. > > > > Signed-off-by: Dario Binacchi <dario.binacchi@xxxxxxxxxxxxxxxxxxxx> > > --- > > > > include/dt-bindings/mfd/stm32f7-rcc.h | 1 + > > 1 file changed, 1 insertion(+) > > Applied, thanks I upstreamed the v2 of this series (https://lore.kernel.org/all/20230427204540.3126234-1-dario.binacchi@xxxxxxxxxxxxxxxxxxxx/) that doesn't contain this change to net/main without noticing that the DT changes in that series depend on it. This broke the DT compilation of the stm32f746.dtsi in the net/main tree. I don't see the stm32f7-rcc.h changes in linus/master so I'm afraid this will break mainline too :/ What are the possible solutions? I see: 1) revert the stm32f746.dtsi changes via net/main 2) upstream the stm32f7-rcc.h changes via net/main, too 3) upstream the stm32f7-rcc.h changes via you tree, so that it hits mainline in the v6.4 release cycle. I'm in favor of solution number 1. Thoughts? Sorry for the mess, Marc -- Pengutronix e.K. | Marc Kleine-Budde | Embedded Linux | https://www.pengutronix.de | Vertretung Nürnberg | Phone: +49-5121-206917-129 | Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-9 |
Attachment:
signature.asc
Description: PGP signature
