I noticed that commits in your branch are not up to date with latest Jarkoo reviews on my patches (see changes since v2). There is no conflict if you replace conflicting patches from your branch by patches from this series. Could you replace your duplicate commits with this patch series? On 28/01/2021 18:38, Mickaël Salaün wrote: > > > On 28/01/2021 17:52, David Howells wrote: >> >> Hi Mickaël, > Hi David, > >> >> I could pull your patches (unless Jarkko wants to), but can you please drop >> the patches that are also in my keys-misc branch lest one or other (or both) >> of our branches get dropped in the next merge window due to conflicts? >> >> Ideally, can you base your branch on my keys-misc branch? > > Sure, I'm rebasing and testing a new patch series. > >> >> Thanks, >> David >>
