linux-kernel - linux-next: manual merge of the mvebu tree with the arm-soc 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:	Sun, 1 Nov 2015 10:35:55 +1100
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>,
	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Vincent Donnefort <vdonnefort@...il.com>
Subject: linux-next: manual merge of the mvebu tree with the arm-soc tree

Hi all,

Today's linux-next merge of the mvebu tree got a conflict in:

  arch/arm/mach-mvebu/pmsu.c

between commit:

  9d2ea95a599a ("ARM: mvebu: add broken-idle option")

from the arm-soc tree and commit:

  da6ee32a42c0 ("ARM: mvebu: add broken-idle option")

from the mvebu tree.

I fixed it up (looks like 2 version of the same thing (though different)
so I just used the version from the arm-doc tree) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
--
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/