linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Mark Salter <msalter@redhat.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Andrew Morton <akpm@linux-foundation.org>,
	Russell King <linux@arm.linux.org.uk>,
	linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Liu Hua <sdu.liu@huawei.com>
Subject: Re: linux-next: manual merge of the akpm-current tree with the arm tree
Date: Thu, 24 Apr 2014 10:27:17 -0400	[thread overview]
Message-ID: <1398349637.3010.68.camel@deneb.redhat.com> (raw)
In-Reply-To: <20140424152516.47a704ec9b749f98b9a93048@canb.auug.org.au>

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

On Thu, 2014-04-24 at 15:25 +1000, Stephen Rothwell wrote:
> Hi Andrew,
> 
> Today's linux-next merge of the akpm-current tree got a conflict in
> arch/arm/include/asm/fixmap.h between commits 4221e2e6b316 ("ARM: 8031/1:
> fixmap: remove FIX_KMAP_BEGIN and FIX_KMAP_END") and a05e54c103b0 ("ARM:
> 8031/2: change fixmap mapping region to support 32 CPUs") from the arm
> tree and commit a665f864487d ("arm: use generic fixmap.h") from the
> akpm-current tree.
> 
> I fixed it up (I have just dropped the akpm-current tree patch for now)
> and can carry the fix as necessary (no action is required).

I'm okay with just dropping it from Andrew's tree. We never got an ack
for it. Now that the generic fixmap and early_ioremap patches are in
Linus' tree, it would probably be best to fold the arm fixmap change
into a new patch set adding early_ioremap to arm.

--Mark


[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

  reply	other threads:[~2014-04-24 14:27 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-04-24  5:25 linux-next: manual merge of the akpm-current tree with the arm tree Stephen Rothwell
2014-04-24 14:27 ` Mark Salter [this message]
2014-06-02  8:42 Stephen Rothwell
2015-07-16  4:50 Stephen Rothwell
2015-12-07  8:00 Stephen Rothwell
2016-07-15  8:38 Stephen Rothwell
2021-08-24  9:10 Stephen Rothwell
2021-09-06  4:46 ` Stephen Rothwell

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=1398349637.3010.68.camel@deneb.redhat.com \
    --to=msalter@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=linux@arm.linux.org.uk \
    --cc=sdu.liu@huawei.com \
    --cc=sfr@canb.auug.org.au \
    /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;
as well as URLs for NNTP newsgroup(s).