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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1345 bytes --]

Hi all,

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.

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.

-- 
Cheers,
Stephen Rothwell

diff --cc MAINTAINERS
index 6851ef7cf1bd,1b15d2dd2535..000000000000
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2269,8 -2203,10 +2269,9 @@@ M:	Andreas Färber <afaerber@suse.de
  L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:	linux-realtek-soc@lists.infradead.org (moderated for non-subscribers)
  S:	Maintained
 -F:	arch/arm/boot/dts/rtd*
 +F:	Documentation/devicetree/bindings/arm/realtek.yaml
+ F:	arch/arm/mach-realtek/
  F:	arch/arm64/boot/dts/realtek/
 -F:	Documentation/devicetree/bindings/arm/realtek.yaml
  
  ARM/RENESAS ARM64 ARCHITECTURE
  M:	Geert Uytterhoeven <geert+renesas@glider.be>

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Andreas Färber]

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)

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@suse.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@suse.de>

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

[Andreas Färber]

Hello Joe,

Am 13.04.20 um 02:27 schrieb Joe Perches:
> 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@suse.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@suse.de>

It was in a late pull request for 5.6 but missed it; Olof wanted to 
merge it for 5.7 instead, but apparently that didn't happen either, so 
I've rebased it for 5.8 earlier today.

For the record, the conflict came from someone reordering entries in my 
MAINTAINERS section, without notifying me.

Note that I have even older gems hidden in my branches: Infineon 
XMC4500, Spansion/Cypress/Infineon FM4, Andromeda Box Edge, ... All 
requires time and desk space.

Regards,
Andreas

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