Re: [GIT PULL] s390 patches for 4.13 merge window
From: Linus Torvalds
Date: Mon Jul 03 2017 - 18:46:56 EST
On Mon, Jul 3, 2017 at 2:01 AM, Martin Schwidefsky
> please pull from the 'for-linus' branch of
> git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus
So my conflict resolution looks different from the one Stephen posted,
which may be due to various reasons, ranging from "linux-next has
other things that conflict" to just "I didn't notice some semantic
conflict since unlike linux-next I don't build for s390".
Regardless, you should check my current -git tree just to verify, and
send me a patch if I screwed something up.