From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Arnd Bergmann <arnd@arndb•de>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Amit Shah <amit.shah@redhat•com>,
Rusty Russell <rusty@rustcorp•com.au>
Subject: linux-next: manual merge of the bkl-llseek tree with the rr tree
Date: Wed, 15 Sep 2010 13:26:46 +1000 [thread overview]
Message-ID: <20100915132646.4aef58f8.sfr@canb.auug.org.au> (raw)
Hi Arnd,
Today's linux-next merge of the bkl-llseek tree got a conflict in
drivers/char/virtio_console.c between commit
a0e1acd65fa6c2da3b039a67ac30cc3b73466c37 ("virtio: console: Send SIGIO to
processes that request it for host events") from the rr tree and commit
7f09912dd2169ca9ce56c5e3428c7b4c5e92e727 ("llseek: automatically
add .llseek fop") from the bkl-llseek tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/char/virtio_console.c
index f7adfd3,524907b..0000000
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
@@@ -824,7 -728,7 +824,8 @@@ static const struct file_operations por
.write = port_fops_write,
.poll = port_fops_poll,
.release = port_fops_release,
+ .fasync = port_fops_fasync,
+ .llseek = noop_llseek,/* read and write both use no f_pos */
};
/*
next reply other threads:[~2010-09-15 3:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-15 3:26 Stephen Rothwell [this message]
2010-09-16 6:54 ` linux-next: manual merge of the bkl-llseek tree with the rr tree Amit Shah
2010-09-16 8:20 ` Arnd Bergmann
2010-09-16 8:56 ` Amit Shah
2010-09-26 14:52 ` Arnd Bergmann
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=20100915132646.4aef58f8.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=amit.shah@redhat$(echo .)com \
--cc=arnd@arndb$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--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