linux-kernel - linux-next: manual merge of the trivial tree with the virtio 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: <20130313140328.f4cc0a85729db25f014eed39@canb.auug.org.au>
Date:	Wed, 13 Mar 2013 14:03:28 +1100
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Jiri Kosina <jkosina@...e.cz>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Rusty Russell <rusty@...tcorp.com.au>,
	Masanari Iida <standby24x7@...il.com>
Subject: linux-next: manual merge of the trivial tree with the virtio tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
Documentation/virtual/virtio-spec.txt between commit 29266e2e29f1
("Remove Documentation/virtual/virtio-spec.txt") from the virtio tree and
commit d097ddaf529f ("doc: virtual: Fix typos in virtio-spec.txt") from
the trivial tree.

The former removed the file, so I did that 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