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 new device support, features and cleanups for the 5.6 cycle
Date: Fri, 10 Jan 2020 10:45:43 +0100 [thread overview]
Message-ID: <20200110094543.GA399864@kroah.com> (raw)
In-Reply-To: <20200105125333.60db3e63@archlinux>
On Sun, Jan 05, 2020 at 12:53:33PM +0000, Jonathan Cameron wrote:
> Hi Greg,
>
> I did see a merge conflict when merging this your staging/staging-next
> around deletion of include/Kbuild
>
> I've not been following what has been going on around that, but simply
> removing the file seems to be the obvious solution.
Looks sane, now pulled and pushed out, thanks.
greg k-h
prev parent reply other threads:[~2020-01-10 9:45 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-05 12:49 [PULL] First set of IIO new device support, features and cleanups for the 5.6 cycle Jonathan Cameron
2020-01-05 12:53 ` Jonathan Cameron
2020-01-10 9:45 ` 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=20200110094543.GA399864@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.