Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1752314AbdGCWqK (ORCPT <rfc822;w@1wt.eu>);
        Mon, 3 Jul 2017 18:46:10 -0400
Received: from mail-oi0-f48.google.com ([209.85.218.48]:35369 "EHLO
        mail-oi0-f48.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752038AbdGCWqC (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 3 Jul 2017 18:46:02 -0400
MIME-Version: 1.0
In-Reply-To: <20170703110134.11ff3478@mschwideX1>
References: <20170703110134.11ff3478@mschwideX1>
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Jul 2017 15:46:00 -0700
X-Google-Sender-Auth: 9b_FKti3pDnZYX1LctYNnJlSvdE
Message-ID: <CA+55aFzLHhf2+jXSQG8pd3AiZ-x9U3sYzgurWQFC+u9G33NJfA@mail.gmail.com>
Subject: Re: [GIT PULL] s390 patches for 4.13 merge window
To: Martin Schwidefsky <schwidefsky@de.ibm.com>,
        Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-kernel <linux-kernel@vger.kernel.org>,
        linux-s390 <linux-s390@vger.kernel.org>,
        Heiko Carstens <heiko.carstens@de.ibm.com>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 607
Lines: 16

On Mon, Jul 3, 2017 at 2:01 AM, Martin Schwidefsky
<schwidefsky@de.ibm.com> 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, 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.

          Linus