linux-kernel - Re: linux-next: manual merge of the realtek tree with Linus' 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: <dbdc1f6b-faf8-7d0d-7730-4ae3f5610dde@suse.de>
Date:   Mon, 13 Apr 2020 02:22:49 +0200
From:   Andreas Färber <afaerber@...e.de>
To:     Stephen Rothwell <sfr@...b.auug.org.au>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linus Torvalds <torvalds@...ux-foundation.org>,
        Joe Perches <joe@...ches.com>,
        "linux-realtek-soc@...ts.infradead.org" 
        <linux-realtek-soc@...ts.infradead.org>
Subject: Re: linux-next: manual merge of the realtek tree with Linus' tree

Hi,

Am 13.04.20 um 00:50 schrieb Stephen Rothwell:
> Today's linux-next merge of the realtek tree got a conflict in:
> 
>    MAINTAINERS
> 
> between commit:
> 
>    3b50142d8528 ("MAINTAINERS: sort field names for all entries")
> 
> from Linus' tree and commit:
> 
>    d6656fa4c621 ("ARM: Prepare Realtek RTD1195")
> 
> from the realtek tree.

Already fixed on v5.8/soc but not yet merged into for-next - done now.

Cheers,
Andreas

-- 
SUSE Software Solutions Germany GmbH
Maxfeldstr. 5, 90409 Nürnberg, Germany
GF: Felix Imendörffer
HRB 36809 (AG Nürnberg)