Hi Krzysztof,
Today's linux-next merge of the hdlc tree got a conflict in
Documentation/DocBook/Makefile between commit
7e3975617df8dd8b7fd94f14200abdec9f71729e ("Remove videobook.tmpl") from
Linus' tree and commit 9c7205161b03a43861765a26fc72f5a00fdadf75 ("WAN:
syncppp.c is no longer used by any kernel code. Remove it") from the hdlc
tree.
Overlapping changes. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
diff --cc Documentation/DocBook/Makefile
index fabc064,69f4a93..0000000
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -6,7 -6,7 +6,7 @@@
# To add a new book the only step required is to add the book to the
# list of DOCBOOKS.
- DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \
-DOCBOOKS := z8530book.xml mcabook.xml videobook.xml \
++DOCBOOKS := z8530book.xml mcabook.xml \
kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
procfs-guide.xml writing_usb_driver.xml networking.xml \
kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \
--
To unsubscribe from this list: send the line "unsubscribe linux-next" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
