Re: linux-next: manual merge of the realtek tree with Linus' tree

[Joe Perches]

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@xxxxxxx>
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@xxxxxxx>