linux-kernel - Re: linux-next: manual merge of the msm tree with the arm 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 for Android: free password hash cracker in your pocket

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

Message-ID: <1272991333.4813.1.camel@c-dwalke-linux.qualcomm.com>
Date:	Tue, 04 May 2010 09:42:13 -0700
From:	Daniel Walker <dwalker@...eaurora.org>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Russell King <rmk@....linux.org.uk>
Subject: Re: linux-next: manual merge of the msm tree with the arm tree

On Tue, 2010-05-04 at 11:07 +1000, Stephen Rothwell wrote:
> Hi Daniel,
> 
> Today's linux-next merge of the msm tree got a conflict in
> arch/arm/mach-msm/Kconfig between commit
> 4b53eb4f5d78416456bb969ce30e3bed2731d744 ("arm: msm: allow ARCH_MSM to
> have v7 cpus") from the arm tree and commit
> e17047ea51cc2eac3e920e5a669f99efd44f446f ("arm: msm: smd: use either
> package v3 or v4 not both") from the msm tree.
> 
> I fixed it up (see below) and can carry the fix as necessary.

Ok .. I'll merge the changes in Russell tree into my tree, that should
fix it I think.

Daniel

--
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/