linux-kernel - Re: linux-next: manual merge of the trivial 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-prev] [day] [month] [year] [list]

Date:	Tue, 14 Jun 2011 10:42:52 +0200 (CEST)
From:	Jiri Kosina <jkosina@...e.cz>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Timur Tabi <timur@...escale.com>,
	Mark Brown <broonie@...nsource.wolfsonmicro.com>,
	Joe Perches <joe@...ches.com>
Subject: Re: linux-next: manual merge of the trivial tree with the  tree

On Tue, 14 Jun 2011, Stephen Rothwell wrote:

> Today's linux-next merge of the trivial tree got a conflict in
> sound/soc/fsl/fsl_ssi.c between commit 147dfe90f730 ("ASoC: p1022ds: fix
> incorrect referencing of device tree properties") from the sound tree and
> commit 28f65c11f2ff ("treewide: Convert uses of struct resource to
> resource_size(ptr)") from the trivial tree.
> 
> The former supercedes the latter.

I have dropped the hunk from my tree, thanks for reporting.

-- 
Jiri Kosina
SUSE Labs
--
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/