On Fri, Aug 19, 2022 at 11:17 AM Geert Uytterhoeven <geert@xxxxxxxxxxxxxx> wrote: > > This may cause conflicts with the usual refresh I plan to do for > v6.0-rc1, which will be very similar to > https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git/commit/?id=517d634d376042ab797d9feeb94236ad4cb03396 > So it may be better to drop this part. > > However, that decision is up to you, as you will have to handle the > conflict when merging renesas-arm-defconfig-for-v6.0-tag1 later ;-) > But sfr might complain before... I'm not too worried here, if you just do the 'savedefconfig' step, you should get the same change and the mergetool will figure it out. In case there is a nasty context conflict, you could just send that part early so I can resolve it. Arnd
