[U-Boot] [PATCH] pinctrl: renesas: Synchronize Gen2/Gen3 tables with Linux 5.2-rc5

Marek Vasut marex at denx.de
Mon Jun 17 15:46:09 UTC 2019


On 6/17/19 5:39 PM, Eugeniu Rosca wrote:
> In spite of the summary line, U-Boot commits [1-2] seem to have
> aligned the U-Boot PFC tables to Linux v5.1 rather than to v5.0, since
> they also imported the Linux 5.1 commits listed in [3].

Damn, I must've forgotten to update the commit message :-(

> What current commit tries to accomplish is to align the Gen2 and Gen3
> pinctrl tables to Linux v5.2-rc5. Importing these updates in two steps
> as done before (i.e. separately for Gen2 and Gen3) is somewhat difficult
> due to Linux commits like [5-6] which atomically update both Gen2/3
> platforms and whose breakdown would not be easily possible.

Yep, the resync is no fun. Can we wait for 5.2 final with this ? I would
very much like that, since it would align with 2019.07 release too.

> The detailed list of Linux commits squashed into this U-Boot patch is
> shown in [4]. The second column in [4] depicts the patch id mismatch
> between the original Linux and the resulted U-Boot commit. The
> exclamation mark means that manual conflict resolution was involved
> during cherry picking Linux commit into U-Boot repository (this is
> mainly caused by dropped changes in files like pfc-r8a7795-es1.c and
> pfc-r8a77980.c which are missing in U-Boot).

Nice, thanks.

[...]

-- 
Best regards,
Marek Vasut


More information about the U-Boot mailing list