[GIT PULL] s390 patches for 4.13 merge window #2

2017-07-05 Thread Martin Schwidefsky
Hi Linus, please pull from the 'for-linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus to receive the following updates: * The fixup for the blk-mq clash with the scm driver * An improvement for the driver in regard to raw I/O * Bug fixes and clean

Re: [GIT PULL] s390 patches for 4.13 merge window

2017-07-04 Thread Linus Torvalds
On Tue, Jul 4, 2017 at 1:29 AM, Martin Schwidefsky wrote: > > @Linus: > I can add this to the s390 tree and sent the patch with the next please-pull. > Or you can apply the patch directly, whatever you prefer. I'll wait for your pull. Thanks, Linus

Re: [GIT PULL] s390 patches for 4.13 merge window

2017-07-04 Thread Martin Schwidefsky
On Tue, 4 Jul 2017 10:05:30 +0200 Martin Schwidefsky wrote: > On Tue, 4 Jul 2017 17:58:18 +1000 > Stephen Rothwell wrote: > > > Hi Linus, > > > > On Mon, 3 Jul 2017 15:46:00 -0700 Linus Torvalds > > wrote: > > > > > > On Mon, Jul 3, 2017 at 2:01 AM, Martin Schwidefsky > > > wrote: > >

Re: [GIT PULL] s390 patches for 4.13 merge window

2017-07-04 Thread Martin Schwidefsky
On Tue, 4 Jul 2017 17:58:18 +1000 Stephen Rothwell wrote: > Hi Linus, > > On Mon, 3 Jul 2017 15:46:00 -0700 Linus Torvalds > wrote: > > > > On Mon, Jul 3, 2017 at 2:01 AM, Martin Schwidefsky > > wrote: > > > > > > please pull from the 'for-linus' branch of > > > > > > git://git.kern

Re: [GIT PULL] s390 patches for 4.13 merge window

2017-07-04 Thread Stephen Rothwell
Hi Linus, On Mon, 3 Jul 2017 15:46:00 -0700 Linus Torvalds wrote: > > On Mon, Jul 3, 2017 at 2:01 AM, Martin Schwidefsky > wrote: > > > > 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

Re: [GIT PULL] s390 patches for 4.13 merge window

2017-07-03 Thread Linus Torvalds
On Mon, Jul 3, 2017 at 2:01 AM, Martin Schwidefsky wrote: > > 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, r

Re: [GIT PULL] s390 patches for 4.13 merge window

2017-07-03 Thread Stephen Rothwell
Hi all, On Mon, 3 Jul 2017 11:01:34 +0200 Martin Schwidefsky wrote: > > please pull from the 'for-linus' branch of > > git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus > > to receive the following updates: > > The bulk of the s390 patches for 4.13. Some new things

[GIT PULL] s390 patches for 4.13 merge window

2017-07-03 Thread Martin Schwidefsky
Hi Linus, please pull from the 'for-linus' branch of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git for-linus to receive the following updates: The bulk of the s390 patches for 4.13. Some new things but mostly bug fixes and cleanups. Noteworthy changes: * The SCM block dr