From: Stephen Rothwell <s...@canb.auug.org.au> Date: Tue, 9 Jul 2019 10:27:28 +1000
> I am still getting this conflict (the commit ids may have changed). > Just a reminder in case you think Linus may need to know. I'm resolving this right now, thanks Stephen.
