linux-kernel - Re: 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: Windows password security audit tool. GUI, reports in PDF.

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

Date:	Tue, 20 Sep 2011 15:04:45 +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,
	Amos Kong <kongjianjun@...il.com>,
	Randy Dunlap <rdunlap@...otime.net>,
	Paul Bolle <pebolle@...cali.nl>
Subject: Re: linux-next: manual merge of the trivial tree with the kernel-doc
 tree

On Mon, 19 Sep 2011, Stephen Rothwell wrote:

> 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.

I don't know where to get either linux-next or linux-doc at the moment, so 
just correct me if I am wrong -- I will just drop the 
Documentation/PCI/pci.txt hunk from c460578a674f in my tree, right?

Thanks,

-- 
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/