linux-kernel - linux-next: manual merge of the driver-core tree with the omap

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]

Message-ID: <20141203180127.2970ff3a@canb.auug.org.au>
Date:	Wed, 3 Dec 2014 18:01:27 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Greg KH <greg@...ah.com>, Tomi Valkeinen <tomi.valkeinen@...com>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Jyri Sarha <jsarha@...com>, Wolfram Sang <wsa@...-dreams.de>
Subject: linux-next: manual merge of the driver-core tree with the omap_dss2
 tree

Hi Greg,

Today's linux-next merge of the driver-core tree got conflicts in
sound/soc/omap/omap-hdmi-card.c and sound/soc/omap/omap-hdmi.c between
commit ab387c1e51d7 ("ASoC: omap: Remove obsolete HDMI audio code and
Kconfig options") from the omap_dss2 tree and commit d34135b4c0ef
("ASoC: omap: drop owner assignment from platform_drivers") from the
driver-core tree.

I fixed it up (I removed the files) and can carry the fix as necessary
(no action is required).

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

Content of type "application/pgp-signature" skipped