public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Krzysztof Hałasa" <khc@pm•waw.pl>
Cc: linux-next@vger•kernel.org, "David S. Miller" <davem@davemloft•net>
Subject: linux-next: manual merge of the hdlc tree
Date: Thu, 13 Nov 2008 15:21:51 +1100	[thread overview]
Message-ID: <20081113152151.6dc38681.sfr@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 598 bytes --]

Hi Krzysztof,

I have been carrying a conflict between your tree, Linus' and the net
trees.  Could you please do the following:
	merge Linus' tree into yours and fix up the conflict
(Documentation/DocBook/wanbook.tmpl is modified in Linus' tree and
removed in yours)
	send commit 8a8c8f08abe7d3fd82c2853d0e1f391f8bfc96db ("WAN:
syncppp.c is no longer used by any kernel code. Remove it") to Dave
Miller to include in the net tree.  You can keep it in your tree as well.

Thanks.
-- 
Cheers,
Stephen Rothwell                    sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]

next             reply	other threads:[~2008-11-13  4:22 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-11-13  4:21 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2008-10-31  5:29 linux-next: manual merge of the hdlc tree Stephen Rothwell
2008-10-31 17:50 ` Krzysztof Halasa
2008-11-01  0:54   ` 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=20081113152151.6dc38681.sfr@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=davem@davemloft$(echo .)net \
    --cc=khc@pm$(echo .)waw.pl \
    --cc=linux-next@vger$(echo .)kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox