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: <8194c2197b9d57f6c37cc6417c9dc9b310732e6b.camel@perches.com>
Date:   Sun, 12 Apr 2020 17:27:36 -0700
From:   Joe Perches <joe@...ches.com>
To:     Andreas Färber <afaerber@...e.de>,
        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>,
        "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

On Mon, 2020-04-13 at 02:22 +0200, Andreas Färber wrote:
> 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.

Hello Andreas.

One of the lines changed was from 2017.

d6656fa4 (Andreas Färber     2017-10-05 03:59:15 +0200 2263) F: arch/arm/mach-realtek/

Is that commit ever going forward?

commit d6656fa4c6215b293d23ed7242ced83a2fce1fec
Author: Andreas Färber <afaerber@...e.de>
Date:   Thu Oct 5 03:59:15 2017 +0200

    ARM: Prepare Realtek RTD1195
    
    Introduce ARCH_REALTEK Kconfig option also for 32-bit Arm.
    
    Override the text offset to cope with boot ROM occupying first 0xa800
    bytes and further reservations up to 0xf4000 (compare Device Tree).
    
    Add a custom machine_desc to enforce memory carveout for I/O registers.
    
    Signed-off-by: Andreas Färber <afaerber@...e.de>