From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Rusty Russell <rusty@rustcorp•com.au>
Cc: linux-next@vger•kernel.org
Subject: linux-next: upstream,rr merge conflict
Date: Tue, 3 Jun 2008 14:33:14 +1000 [thread overview]
Message-ID: <20080603143314.78b775b0.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 462 bytes --]
Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
include/linux/virtio_config.h between commit
b4f68be6c5d507afdcd74f5be3df0b1209cda503 ("virtio: force callback on
empty.") from Linus' tree and commit
47f299f584f925ee0bd7ae05c5a85efbcb1e6022 ("virtio:transport-features")
from the rr tree. I kept both additions to the file.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 189 bytes --]
reply other threads:[~2008-06-03 4:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20080603143314.78b775b0.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=rusty@rustcorp$(echo .)com.au \
/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