From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Jayachandran C <jchandra@broadcom.com>,
Ralf Baechle <ralf@linux-mips.org>
Subject: Re: linux-next: manual merge of the cpuinit tree with the mips tree
Date: Thu, 27 Jun 2013 14:17:14 -0400 [thread overview]
Message-ID: <51CC81AA.7090406@windriver.com> (raw)
In-Reply-To: <20130627184826.416dcb8c84d77f8455794829@canb.auug.org.au>
On 13-06-27 04:48 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the cpuinit tree got a conflict in
> arch/mips/mm/tlbex.c between commits 8c24cb9d180b ("MIPS: Move generated
> code to .text for microMIPS") and d45accb44e19 ("MIPS: mm: Use scratch
> for PGD when !CONFIG_MIPS_PGD_C0_CONTEXT") from the mips tree and commit
> "MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code" from the cpuinit
> tree.
Now fixed/refreshed, thanks!
P.
--
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> Ralf, your merge commit e6d254aea905 ("Merge branch '3.10-fixes' into
> mips-for-linux-next") left some conflict markers in this file which I
> have removed as well.
>
WARNING: multiple messages have this Message-ID (diff)
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: <linux-next@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
Jayachandran C <jchandra@broadcom.com>,
Ralf Baechle <ralf@linux-mips.org>
Subject: Re: linux-next: manual merge of the cpuinit tree with the mips tree
Date: Thu, 27 Jun 2013 14:17:14 -0400 [thread overview]
Message-ID: <51CC81AA.7090406@windriver.com> (raw)
In-Reply-To: <20130627184826.416dcb8c84d77f8455794829@canb.auug.org.au>
On 13-06-27 04:48 AM, Stephen Rothwell wrote:
> Hi Paul,
>
> Today's linux-next merge of the cpuinit tree got a conflict in
> arch/mips/mm/tlbex.c between commits 8c24cb9d180b ("MIPS: Move generated
> code to .text for microMIPS") and d45accb44e19 ("MIPS: mm: Use scratch
> for PGD when !CONFIG_MIPS_PGD_C0_CONTEXT") from the mips tree and commit
> "MIPS: Delete __cpuinit/__CPUINIT usage from MIPS code" from the cpuinit
> tree.
Now fixed/refreshed, thanks!
P.
--
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
>
> Ralf, your merge commit e6d254aea905 ("Merge branch '3.10-fixes' into
> mips-for-linux-next") left some conflict markers in this file which I
> have removed as well.
>
next prev parent reply other threads:[~2013-06-27 18:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-27 8:48 linux-next: manual merge of the cpuinit tree with the mips tree Stephen Rothwell
2013-06-27 18:17 ` Paul Gortmaker [this message]
2013-06-27 18:17 ` Paul Gortmaker
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=51CC81AA.7090406@windriver.com \
--to=paul.gortmaker@windriver.com \
--cc=jchandra@broadcom.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ralf@linux-mips.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.