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

Message-Id: <20120912164353.6fb8b35ff534088a79792acd@canb.auug.org.au>
Date:	Wed, 12 Sep 2012 16:43:53 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Stephen Warren <swarren@...dia.com>,
	Colin Cross <ccross@...roid.com>,
	Olof Johansson <olof@...om.net>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Venu Byravarasu <vbyravarasu@...dia.com>,
	Greg KH <greg@...ah.com>, Felipe Balbi <balbi@...com>,
	Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@....com>,
	Will Deacon <will.deacon@....com>
Subject: linux-next: manual merge of the tegra tree with the  tree

Hi all,

Today's linux-next merge of the tegra tree got a conflict in
arch/arm/mach-tegra/devices.c arch/arm/mach-tegra/devices.h between
commits 2db4ddfe6e23 ("ARM: pmu: remove arm_pmu_type enumeration") from
the arm-perf tree and 1ba8216f0bc0 ("usb: move phy driver from mach-tegra
to drivers/usb") from the usb tree and commit ba07ee57d4bc ("ARM: tegra:
remove dead code") from the tegra tree.

The latter removed the files, so I did that (no action is required).

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

Content of type "application/pgp-signature" skipped