lkml.org 
[lkml]   [2022]   [Jul]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the rtc tree with the arm-soc-fixes tree
Date
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.
\
 
 \ /
  Last update: 2022-07-11 10:19    [W:0.032 / U:0.032 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site