Hi Eugeniu, On Fri, Jul 5, 2019 at 9:52 PM Eugeniu Rosca <roscaeuge...@gmail.com> wrote: > > Hi Igor, > > On Fri, Jul 05, 2019 at 03:37:36PM +0300, Igor Opaniuk wrote: > [..] > > include/environment/ti/boot.h | 58 +++++++++++++++++++++++++++++++---- > [..] > > - "name=boot,size=20M,uuid=${uuid_gpt_boot};" \ > > FWIW this patch doesn't apply to u-boot/master due to the above line. > FWIW the size of the boot partition defined in this file has always > been equal to 10M in u-boot/master, so most likely this patch depends > on a local 10M->20M increase of the boot partition size. >
It was me who asked Igor to do so, as I suggest this patch will be applied on top of [1], and I guess it's specified in PATCH #0. I have an integration branch [2] which contains all Android-related patch I want to be merged during the merge window, and A/B series is applied on top of [1] there. There is inevitable dependency clash between patches, so I figured it doesn't matter what the order is, we just should keep that order somewhere, and for me it's [2], for Igor it's PATCH #0 which mentions dependency patches for this series. Otherwise we risk this patch to overwrite the changes I did in [1], and I'd like to avoid it. Not sure what is the commonly adopted mechanism for this (specifying dependencies), but in this case I guess I will ask the custodians to apply patches in correct order, or apply patches according to [2], that's the best I came up with. Please tell me if you see more standard/wise choice for this. [1] https://patchwork.ozlabs.org/patch/1126434/ [2] https://github.com/joe-skb7/u-boot-misc/commits/android-next > -- > Best Regards, > Eugeniu. _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot