linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Russell King <rmk@arm.linux.org.uk>
Subject: Re: linux-next: manual merge of the arm-lpae tree with the arm tree
Date: Fri, 10 Jun 2011 15:43:27 +0100	[thread overview]
Message-ID: <20110610144326.GC18133@e102109-lin.cambridge.arm.com> (raw)
In-Reply-To: <20110610105255.3105eef2.sfr@canb.auug.org.au>

On Fri, Jun 10, 2011 at 01:52:55AM +0100, Stephen Rothwell wrote:
> Today's linux-next merge of the arm-lpae tree got a conflict in
> arch/arm/mm/context.c between commit 07989b7ad63a ("Revert "ARM: 6943/1:
> mm: use TTBR1 instead of reserved context ID"") from the arm tree and
> commit 21fa7e3ea279 ("ARM: LPAE: Add context switching support") from the
> arm-lpae tree.
> 
> I fixed it up (I think - see below) and can carry the fix as necessary.

Thanks for this. I replaced the conflicting commit (21fa7e4e ARM: LPAE:
Add context switching support) with an older version (prior to patch
6943/1 that Russell reverted). The cpu_set_reserved_ttbr0() is now
called cpu_set_asid() and does something different.

In my for-next branch I also included the patches that Russell pushed
via his tree to be able to solve the conflicts:

51b5dba Revert "ARM: 6943/1: mm: use TTBR1 instead of reserved context ID"
25194f6 Revert "ARM: 6944/1: mm: allow ASID 0 to be allocated to tasks"

and I removed from my branch:

b488121 ARM: mm: fix racy ASID rollover broadcast on SMP platforms

Hopefully there shouldn't be further conflicts in tomorrow's -next tree.

-- 
Catalin


  reply	other threads:[~2011-06-10 14:43 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-06-10  0:52 linux-next: manual merge of the arm-lpae tree with the arm tree Stephen Rothwell
2011-06-10 14:43 ` Catalin Marinas [this message]
2011-06-17  0:26 Stephen Rothwell
2011-06-17 10:17 ` Catalin Marinas
2011-07-07  1:14 Stephen Rothwell
2011-09-12  1:15 Stephen Rothwell
2011-11-22  1:03 Stephen Rothwell
2011-11-22  8:13 ` Russell King
2011-11-22  9:58   ` Catalin Marinas
2011-11-22  9:47 ` Catalin Marinas
2011-11-22 11:05 ` Catalin Marinas
2011-12-08  0:00 Stephen Rothwell
2011-12-09 10:36 ` Catalin Marinas
2011-12-09 11:11   ` 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=20110610144326.GC18133@e102109-lin.cambridge.arm.com \
    --to=catalin.marinas@arm.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=rmk@arm.linux.org.uk \
    --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).