From: Greg KH <gregkh@linuxfoundation.org>
To: Jonathan Cameron <jic23@kernel.org>
Cc: linux-iio@vger.kernel.org
Subject: Re: [PULL] First set of IIO fixes for 5.7
Date: Mon, 20 Apr 2020 14:09:14 +0200 [thread overview]
Message-ID: <20200420120914.GA3937360@kroah.com> (raw)
In-Reply-To: <20200419182601.5bf20f77@archlinux>
On Sun, Apr 19, 2020 at 06:26:01PM +0100, Jonathan Cameron wrote:
> Hi Greg,
>
> Just a quick note to say there is a trivial merge conflict in MAINTAINERS
> due to Linus sorting the file using the parse-maintainers script.
>
> The resolution is fairly obvious but involves manually dropping
> the line that ends up duplicated if you just grab the hunk from the
> patch in here.
>
> Note that patch is here as the large number of bounces people are getting
> has lead to requests for me to hurry that one through.
Now merged, the MAINTAINERS thing was easy to sort out, thanks!
greg k-h
prev parent reply other threads:[~2020-04-20 12:09 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-19 17:21 [PULL] First set of IIO fixes for 5.7 Jonathan Cameron
2020-04-19 17:26 ` Jonathan Cameron
2020-04-20 12:09 ` Greg KH [this message]
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=20200420120914.GA3937360@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=jic23@kernel.org \
--cc=linux-iio@vger.kernel.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