linux-next: manual merge of the bkl-llseek tree with the rr tree

[Stephen Rothwell]

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@xxxxxxxxxxxxxxxx

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 */
  };
  
  /*
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/