From: <Conor.Dooley@microchip.com>
To: <sfr@canb.auug.org.au>, <alexandre.belloni@bootlin.com>,
<olof@lixom.net>, <arnd@arndb.de>
Cc: <linux-arm-kernel@lists.infradead.org>,
<Conor.Dooley@microchip.com>, <linux-kernel@vger.kernel.org>,
<linux-next@vger.kernel.org>
Subject: Re: linux-next: manual merge of the rtc tree with the arm-soc-fixes tree
Date: Mon, 11 Jul 2022 08:19:14 +0000 [thread overview]
Message-ID: <44a3b35c-5677-7107-ae5a-50bbbc815cda@microchip.com> (raw)
In-Reply-To: <20220711181424.70195b52@canb.auug.org.au>
On 11/07/2022 09:14, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the rtc tree got a conflict in:
>
> MAINTAINERS
>
> between commit:
>
> 2058dc831ff8 ("MAINTAINERS: add polarfire rng, pci and clock drivers")
>
> from the arm-soc-fixes tree and commit:
>
> 1bdb08c180e8 ("MAINTAINERS: add PolarFire SoC's RTC")
>
> from the rtc tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
LGTM Stephen, thanks.
prev parent reply other threads:[~2022-07-11 8:19 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-11 8:14 linux-next: manual merge of the rtc tree with the arm-soc-fixes tree Stephen Rothwell
2022-07-11 8:19 ` Conor.Dooley [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=44a3b35c-5677-7107-ae5a-50bbbc815cda@microchip.com \
--to=conor.dooley@microchip.com \
--cc=alexandre.belloni@bootlin.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
/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).