From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Krzysztof Halasa <khc@pm•waw.pl>
Cc: linux-next@vger•kernel.org, Jonathan Corbet <corbet@lwn•net>
Subject: linux-next: manual merge of the hdlc tree
Date: Fri, 4 Jul 2008 18:56:45 +1000 [thread overview]
Message-ID: <20080704185645.d96ef6dd.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 507 bytes --]
Hi Krzysztof,
Today's linux-next merge of the hdlc tree got a conflict in
drivers/net/wan/cosa.c between commit
0911810755fc9f15659cc3cb43912633b90027a0 ("cosa: cdev lock_kernel()
pushdown") from the blk-removal tree and commit
d2e510df1fe342b6df51c1af036ca28a60f6fc55 ("WAN: Port COSA driver to
generic HDLC") from the hdlc tree.
Just a simple overlapping change. I can carry the fixup.
--
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-07-04 8:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-07-04 8:56 Stephen Rothwell [this message]
2008-07-04 9:39 ` linux-next: manual merge of the hdlc tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2008-07-08 7:23 Stephen Rothwell
2008-07-08 7:27 Stephen Rothwell
2008-10-17 5:50 Stephen Rothwell
2008-10-17 14:30 ` Krzysztof Halasa
2008-10-29 6:52 Stephen Rothwell
2008-10-31 5:29 Stephen Rothwell
2008-10-31 17:50 ` Krzysztof Halasa
2008-11-01 0:54 ` Stephen Rothwell
2008-11-13 4:21 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=20080704185645.d96ef6dd.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=corbet@lwn$(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
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