From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
        id S1753849AbdA3R2b (ORCPT <rfc822;w@1wt.eu>);
        Mon, 30 Jan 2017 12:28:31 -0500
Received: from mail-it0-f43.google.com ([209.85.214.43]:38322 "EHLO
        mail-it0-f43.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752446AbdA3R2S (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Mon, 30 Jan 2017 12:28:18 -0500
MIME-Version: 1.0
In-Reply-To: <20170130152855.7e8cb6c2@canb.auug.org.au>
References: <20170130152855.7e8cb6c2@canb.auug.org.au>
From: Linus Walleij <linus.walleij@linaro.org>
Date: Mon, 30 Jan 2017 18:28:16 +0100
Message-ID: <CACRpkdYtux7ZqJ1VLbpa0Qgk3Nf+SczGdhOT6AK1GsNQ0b_NxQ@mail.gmail.com>
Subject: Re: linux-next: manual merge of the gpio tree with the staging tree
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Greg KH <greg@kroah.com>,
        "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Roman Sommer <roman.sommer@fau.de>,
        Mika Westerberg <mika.westerberg@linux.intel.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

On Mon, Jan 30, 2017 at 5:28 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging.  You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.

OK I'll mention it to Linus (the big penguin). Thanks!

Linus Walleij