From: Krzysztof Halasa <khc@pm.waw.pl>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, Alan Cox <alan@redhat.com>
Subject: Re: linux-next: manual merge of the hdlc tree
Date: Fri, 31 Oct 2008 18:50:09 +0100 [thread overview]
Message-ID: <m3prlgfycu.fsf@maximus.localdomain> (raw)
In-Reply-To: <20081031162913.3cc30025.sfr@canb.auug.org.au> (Stephen Rothwell's message of "Fri\, 31 Oct 2008 16\:29\:13 +1100")
Hi Stephen,
Stephen Rothwell <sfr@canb.auug.org.au> writes:
> Today's linux-next merge of the hdlc tree got a conflict in
> Documentation/DocBook/wanbook.tmpl between commit
> 89a056df78b113fcab21d71cd24aa1893c09225b ("Rationalise Randy's address a
> bit") from Linus' tree and commit
> 8a8c8f08abe7d3fd82c2853d0e1f391f8bfc96db ("WAN: syncppp.c is no longer
> used by any kernel code. Remove it.") from the hdlc tree.
>
> The former updated a file that the latter removed. I just removed it.
Thanks. I will request Jeff to pull this code soon (the tree will be
reset) so I hope the conflicts will end in few days.
--
Krzysztof Halasa
next prev parent reply other threads:[~2008-10-31 17:50 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-31 5:29 linux-next: manual merge of the hdlc tree Stephen Rothwell
2008-10-31 17:50 ` Krzysztof Halasa [this message]
2008-11-01 0:54 ` Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-11-13 4:21 Stephen Rothwell
2008-10-29 6:52 Stephen Rothwell
2008-10-17 5:50 Stephen Rothwell
2008-10-17 14:30 ` Krzysztof Halasa
2008-07-08 7:27 Stephen Rothwell
2008-07-08 7:23 Stephen Rothwell
2008-07-04 8:56 Stephen Rothwell
2008-07-04 9:39 ` Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m3prlgfycu.fsf@maximus.localdomain \
--to=khc@pm.waw.pl \
--cc=alan@redhat.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox