linux-kernel - linux-next: manual merge of the rd-docs tree with the trivial 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]

Message-ID: <20140826154823.086bed75@canb.auug.org.au>
Date:	Tue, 26 Aug 2014 15:48:23 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Randy Dunlap <rdunlap@...radead.org>, Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Pranith Kumar <bobby.prani@...il.com>,
	Christoph Lameter <cl@...ux.com>
Subject: linux-next: manual merge of the rd-docs tree with the trivial tree

Hi Randy,

Today's linux-next merge of the rd-docs tree got a conflict in
Documentation/this_cpu_ops.txt between commit 0c3ed93c1c2c ("doc: fix
acronym for read-modify-write") from the trivial tree and commit
1a62db155b94 ("doc: this_cpu_ops.txt: Update description of
this_cpu_ops") from the rd-docs tree.

I fixed it up (the latter is a superset of the former) and can carry
the fix as necessary (no action is required).

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

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