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
Date: Sun, 19 Aug 2018 08:07:30 +0200 [thread overview]
Message-ID: <20180819060730.GB2895@kroah.com> (raw)
In-Reply-To: <CA+55aFzB8vSuRatQAy=LmLxjeU48dPwW3tOGpZQaBjWRw115aQ@mail.gmail.com>
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
next prev parent reply other threads:[~2018-08-19 6:07 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-18 15:57 Greg KH
2018-08-18 18:00 ` Linus Torvalds
2018-08-19 6:07 ` Greg Kroah-Hartman [this message]
2018-08-28 10:38 ` Ahmed S. Darwish
2018-08-28 11:20 ` Todd Poynor
2018-08-28 12:36 ` Greg KH
2018-08-28 14:30 ` Ahmed S. Darwish
2018-09-10 8:16 ` Greg KH
2018-09-10 15:28 ` [PATCH] staging: gasket: TODO: re-implement using UIO Ahmed S. Darwish
2018-11-07 0:20 ` RFC: staging: gasket: " Todd Poynor
2018-11-07 9:20 ` Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180819060730.GB2895@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=devel@linuxdriverproject.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®