From: Joe Perches <joe@perches.com>
To: "Andreas Färber" <afaerber@suse.de>,
"Stephen Rothwell" <sfr@canb.auug.org.au>
Cc: 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>
Subject: Re: linux-next: manual merge of the realtek tree with Linus' tree
Date: Sun, 12 Apr 2020 17:27:36 -0700 [thread overview]
Message-ID: <8194c2197b9d57f6c37cc6417c9dc9b310732e6b.camel@perches.com> (raw)
In-Reply-To: <dbdc1f6b-faf8-7d0d-7730-4ae3f5610dde@suse.de>
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>
next prev parent reply other threads:[~2020-04-13 0:29 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 [this message]
2020-04-13 0:52 ` Andreas Färber
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=8194c2197b9d57f6c37cc6417c9dc9b310732e6b.camel@perches.com \
--to=joe@perches.com \
--cc=afaerber@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linux-realtek-soc@lists.infradead.org \
--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®