From: Alexandre Belloni <alexandre.belloni@bootlin.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
Linux-Next Mailing List <linux-next@vger.kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: Re: linux-next: manual merge of the rtc tree with the asm-generic tree
Date: Sat, 17 Mar 2018 14:22:52 +0100 [thread overview]
Message-ID: <20180317132252.GG4123@piout.net> (raw)
In-Reply-To: <20180315185917.3316d781@canb.auug.org.au>
Hi Stephen,
On 15/03/2018 at 18:59:17 +1100, Stephen Rothwell wrote:
> Hi Alexandre,
>
> Today's linux-next merge of the rtc tree got a conflict in:
>
> drivers/rtc/rtc-tile.c
>
> between commit:
>
> 909ce75a0665 ("rtc: remove tile driver")
>
> from the asm-generic tree and commit:
>
> 1fbcb2aa1d64 ("rtc: tile: remove useless message")
>
> 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.
I've removed the patch from my tree as there is no point in modifying a
driver that is removed.
--
Alexandre Belloni, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
next prev parent reply other threads:[~2018-03-17 13:22 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-15 7:59 linux-next: manual merge of the rtc tree with the asm-generic tree Stephen Rothwell
2018-03-17 13:22 ` Alexandre Belloni [this message]
2018-03-17 22:15 ` Stephen Rothwell
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=20180317132252.GG4123@piout.net \
--to=alexandre.belloni@bootlin.com \
--cc=arnd@arndb.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--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