* linux-next: manual merge of the rtc tree with the asm-generic tree
@ 2018-03-15 7:59 Stephen Rothwell
2018-03-17 13:22 ` Alexandre Belloni
0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2018-03-15 7:59 UTC (permalink / raw)
To: Alexandre Belloni, Arnd Bergmann
Cc: Linux-Next Mailing List, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 701 bytes --]
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.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: linux-next: manual merge of the rtc tree with the asm-generic tree
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
2018-03-17 22:15 ` Stephen Rothwell
0 siblings, 1 reply; 3+ messages in thread
From: Alexandre Belloni @ 2018-03-17 13:22 UTC (permalink / raw)
To: Stephen Rothwell
Cc: Arnd Bergmann, Linux-Next Mailing List, Linux Kernel Mailing List
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-03-17 22:15 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2018-03-17 22:15 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox