Subject: Re: linux-next: manual merge of the hdlc tree

From: Krzysztof Halasa <[email-masked]>
Date: Fri, 17 Oct 2008 16:30:38 +0200

Hi Stephen,

Stephen Rothwell <[email-masked]> writes:

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

Thanks. I will update to have the latest Linus' tree.
-- 
Krzysztof Halasa