linux-kernel - Re: linux-next: manual merge of the cpuinit tree with the mips tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <51CC81AA.7090406@windriver.com>
Date:	Thu, 27 Jun 2013 14:17:14 -0400
From:	Paul Gortmaker <paul.gortmaker@...driver.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
CC:	<linux-next@...r.kernel.org>, <linux-kernel@...r.kernel.org>,
	Jayachandran C <jchandra@...adcom.com>,
	Ralf Baechle <ralf@...ux-mips.org>
Subject: Re: linux-next: manual merge of the cpuinit tree with the mips tree

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.
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/