On Sat, 30 May 2020 at 10:41, Russell King - ARM Linux admin <linux@xxxxxxxxxxxxxxx> wrote: > > On Thu, May 28, 2020 at 09:01:55AM +0200, Ard Biesheuvel wrote: > > On Thu, 28 May 2020 at 01:23, Russell King - ARM Linux admin > > <linux@xxxxxxxxxxxxxxx> wrote: > > > > > > Ard, > > > > > > Please take a look. Obviously, whatever the resolution is going to be > > > needed when Linus opens the merge window. > > > > > > > Sorry for that. > > > > I have pushed the signed tag below to resolve it. Those changes were > > already in v5.7-rc2, so I wouldn't expect this to cause more trouble. > > If you prefer, you could merge v5.7-rc2 into your tree directly > > instead. > > In light of Stephen's report of a different conflict on the 29th, I > haven't pulled this. I don't know if that's a side effect of this > change having been picked up by -next or not. > Fair enough. Both conflicts are unambiguous and self explanatory so I don't think it should be a problem, right?
