linux-kernel - linux-next: manual merge of the trivial tree with the kernel-doc 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 for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-Id: <20110919163946.9165592b447bf5b578146f83@canb.auug.org.au>
Date:	Mon, 19 Sep 2011 16:39:46 +1000
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,
	Amos Kong <kongjianjun@...il.com>,
	Randy Dunlap <rdunlap@...otime.net>,
	Paul Bolle <pebolle@...cali.nl>
Subject: linux-next: manual merge of the trivial tree with the kernel-doc
 tree

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
Documentation/PCI/pci.txt between commit b814f0357fbe
("Documentation/PCI/pci.txt: fix a reference doc name") from the
kernel-doc tree and commit c460578a674f ("Documentation: fix broken
references") from the trivial tree.

It looks like the former supercedes the latter, so I used that.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped