From: Greg KH <gregkh@linuxfoundation.org>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: devel@linuxdriverproject.org,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
linux-kernel@vger.kernel.org
Subject: Re: [GIT PULL] Staging/IIO driver changes for 5.11-rc1
Date: Tue, 15 Dec 2020 12:49:22 +0100 [thread overview]
Message-ID: <X9iiwr5Lf8l8TOpP@kroah.com> (raw)
In-Reply-To: <20201215223752.42c377d7@canb.auug.org.au>
On Tue, Dec 15, 2020 at 10:37:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> On Tue, 15 Dec 2020 11:17:49 +0100 Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > All have been in linux-next for a while with no reported issues.
>
> There is, however, a semantic conflict with a commit that is now in
> Linus' tree:
>
> https://lore.kernel.org/lkml/20201207164601.2b9cefc8@canb.auug.org.au/
Ah, I missed that this hit Linus's tree already, I thought it was only
in linux-next.
As I can't fix it without doing the merge myself, either Linus can pull
this directly from lore using 'b4' or I can send it after he does the
merge.
Linus, your call.
thanks,
greg k-h
next prev parent reply other threads:[~2020-12-15 11:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 10:17 [GIT PULL] Staging/IIO driver changes for 5.11-rc1 Greg KH
2020-12-15 11:37 ` Stephen Rothwell
2020-12-15 11:49 ` Greg KH [this message]
2020-12-15 22:20 ` Linus Torvalds
2020-12-15 22:22 ` pr-tracker-bot
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=X9iiwr5Lf8l8TOpP@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;
as well as URLs for NNTP newsgroup(s).