From: Greg KH <gregkh@linuxfoundation.org>
To: Stephen Rothwell <sfr@rothwell.id.au>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
Andrew Morton <akpm@linux-foundation.org>,
Stephen Rothwell <sfr@canb.auug.org.au>,
devel@linuxdriverproject.org, linux-kernel@vger.kernel.org,
linux-staging@lists.linux.dev, Mark Brown <broonie@kernel.org>,
Sudeep Holla <sudeep.holla@arm.com>,
Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de>,
ARM <linux-arm-kernel@lists.infradead.org>
Subject: Re: [GIT PULL] Staging/IIO driver updates for 5.13-rc1
Date: Mon, 26 Apr 2021 17:11:31 +0200 [thread overview]
Message-ID: <YIbYI2825E4Z2b/3@kroah.com> (raw)
In-Reply-To: <20210427002648.22459fa7@elm.ozlabs.ibm.com>
On Tue, Apr 27, 2021 at 12:26:48AM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> On Mon, 26 Apr 2021 14:46:10 +0200 Greg KH <gregkh@linuxfoundation.org> wrote:
> >
> > All of these have been in linux-next for a while with no reported
> > issues.
>
> There was just these:
>
> https://lore.kernel.org/linux-next/20210329165525.32d51a3a@canb.auug.org.au/
>
> https://lore.kernel.org/linux-next/20210331175151.67fcfe4d@canb.auug.org.au/
>
> (the scmi tree commit mentioned in the latter is now in the arm-soc tree)
>
> Not issues as such, but worth mentioning the conflicts and resolutions.
Yeah, merge issues with other trees are hard to resolve in the single
tree here, not much I can just yet, have to wait for them to hit Linus's
tree.
thanks,
greg k-h
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-04-26 15:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <YIa2ErYuJyCfSkS+@kroah.com>
2021-04-26 14:26 ` [GIT PULL] Staging/IIO driver updates for 5.13-rc1 Stephen Rothwell
2021-04-26 15:11 ` Greg KH [this message]
2021-04-26 18:18 ` Linus Torvalds
2021-04-27 6:22 ` 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=YIbYI2825E4Z2b/3@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=akpm@linux-foundation.org \
--cc=arnd@arndb.de \
--cc=broonie@kernel.org \
--cc=devel@linuxdriverproject.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=sfr@rothwell.id.au \
--cc=sudeep.holla@arm.com \
--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).