linux-kernel - Re: linux-next: manual merge of the rtc tree with the arm-soc-fixes tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <44a3b35c-5677-7107-ae5a-50bbbc815cda@microchip.com>
Date:   Mon, 11 Jul 2022 08:19:14 +0000
From:   <Conor.Dooley@...rochip.com>
To:     <sfr@...b.auug.org.au>, <alexandre.belloni@...tlin.com>,
        <olof@...om.net>, <arnd@...db.de>
CC:     <linux-arm-kernel@...ts.infradead.org>,
        <Conor.Dooley@...rochip.com>, <linux-kernel@...r.kernel.org>,
        <linux-next@...r.kernel.org>
Subject: Re: linux-next: manual merge of the rtc tree with the arm-soc-fixes
 tree

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.