linux-kernel - Re: linux-next: manual merge of the rtc tree with the asm-generic 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] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180317132252.GG4123@piout.net>
Date:   Sat, 17 Mar 2018 14:22:52 +0100
From:   Alexandre Belloni <alexandre.belloni@...tlin.com>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Arnd Bergmann <arnd@...db.de>,
        Linux-Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: manual merge of the rtc tree with the asm-generic
 tree

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