Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Sun, 19 Aug 2018 08:07:30 +0200
From:   Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To:     Linus Torvalds <torvalds@linux-foundation.org>
Cc:     Andrew Morton <akpm@linux-foundation.org>,
        Stephen Rothwell <sfr@canb.auug.org.au>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Driver Project <devel@linuxdriverproject.org>
Subject: Re: [GIT PULL] Staging/IIO driver patches for 4.19-rc1
Message-ID: <20180819060730.GB2895@kroah.com>
References: <20180818155724.GA22569@kroah.com>
 <CA+55aFzB8vSuRatQAy=LmLxjeU48dPwW3tOGpZQaBjWRw115aQ@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <CA+55aFzB8vSuRatQAy=LmLxjeU48dPwW3tOGpZQaBjWRw115aQ@mail.gmail.com>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Sat, Aug 18, 2018 at 11:00:20AM -0700, Linus Torvalds wrote:
> On Sat, Aug 18, 2018 at 8:57 AM Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > Note, you will have a merge problem with a device tree IIO file and the
> > MAINTAINERS file, both resolutions are easy, just take all changed.
> 
> Heh, no. In neither case should I take all changes: the IIO was
> "delete both sides"), and in the MAINTAINERS file, which was delete
> one side, add another, somebody can't even sort stuff alphabetically.

Ah, wow, I totally read that diff backwards, you are right, thanks.

greg k-h