linux-kernel - linux-next: manual merge of the mvebu tree with Linus' 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>] [day] [month] [year] [list]

Date:	Thu, 17 Jul 2014 11:44:44 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jason Cooper <jason@...edaemon.net>, <andrew@...n.ch>,
	<gregory.clement@...e-electrons.com>,
	<linux-arm-kernel@...ts.infradead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	"Rafael J. Wysocki" <rafael.j.wysocki@...el.com>
Subject: linux-next: manual merge of the mvebu tree with Linus' tree

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in
drivers/cpuidle/cpuidle-armada-370-xp.c between commit dc559aabe2d4
("cpuidle: mvebu: Fix the name of the states") from Linus' tree and
commit 742450174037 ("cpuidle: mvebu: rename the driver from
armada-370-xp to mvebu-v7") from the mvebu tree.

The former patch appears to have been applied to the
renamed file, so there was nothing to do (except remove the git created
version of the old file).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

Download attachment "signature.asc" of type "application/pgp-signature" (820 bytes)