Re: [GIT PULL] Char/Misc driver patches for 4.12-rc1

From: Linus Torvalds
Date: Sat May 06 2017 - 14:00:19 EST

On Fri, May 5, 2017 at 10:09 PM, Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
> On Fri, 5 May 2017 13:01:34 -0700 Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> wrote:
>> I prefer doing merge resolutions myself, but I *also* really really
>> prefer the two sides of the conflict having been more aware of the
>> clash.
> Would that be this?

Yup. Apparently neither Greg nor James ended up reacting to that
email, though, so by the time I got the pull requests there was no
mention of it anywhere.