Re: linux-next: manual merge of the trivial tree with the kernel-doctree

[Jiri Kosina]

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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/