On Mon, Feb 28, 2022 at 09:01:49AM +0000, Lee Jones wrote: > On Mon, 28 Feb 2022, Stephen Rothwell wrote: > > > Hi all, > > > > Today's linux-next merge of the char-misc tree got a conflict in: > > I did ask for this *not* to be merged when it was in -testing. Sorry, I missed that, I saw your ack on the patch so that's why I took it. > I'll follow-up with Greg. Should I revert this from my tree? thanks, greg k-h
