mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Andreas Färber" <afaerber@suse.de>
To: Joe Perches <joe@perches.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	"linux-realtek-soc@lists.infradead.org" 
	<linux-realtek-soc@lists.infradead.org>,
	Olof Johansson <olof@lixom.net>
Subject: Re: linux-next: manual merge of the realtek tree with Linus' tree
Date: Mon, 13 Apr 2020 02:52:16 +0200	[thread overview]
Message-ID: <539791a5-9b5f-4969-4dda-6f10ea11b9cd@suse.de> (raw)
In-Reply-To: <8194c2197b9d57f6c37cc6417c9dc9b310732e6b.camel@perches.com>

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)

      reply	other threads:[~2020-04-13  0:52 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-12 22:50 Stephen Rothwell
2020-04-13  0:22 ` Andreas Färber
2020-04-13  0:27   ` Joe Perches
2020-04-13  0:52     ` Andreas Färber [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=539791a5-9b5f-4969-4dda-6f10ea11b9cd@suse.de \
    --to=afaerber@suse.de \
    --cc=joe@perches.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux-realtek-soc@lists.infradead.org \
    --cc=olof@lixom.net \
    --cc=sfr@canb.auug.org.au \
    --cc=torvalds@linux-foundation.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®