linux-next: manual merge of the staging tree with the vfs tree

Stephen Rothwell
2017-12-04T01:58:16Z

Hi Greg,

Today's linux-next merge of the staging tree got a conflict in:

drivers/staging/most/cdev/cdev.c

between commit:

afc9a42b7464 ("the rest of drivers/*: annotate ->poll() instances")

from the vfs tree and commit:

1fd923f38610 ("staging: most: cdev: replace function prefix")

from the staging tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

--
Cheers,
Stephen Rothwell

diff --cc drivers/staging/most/cdev/cdev.c
index 69f530972273,dd9456fd2cd6..000000000000
--- a/drivers/staging/most/cdev/cdev.c
+++ b/drivers/staging/most/cdev/cdev.c
@@@ -287,10 -283,10 +283,10 @@@ comp_read(struct file *filp, char __use
return copied;
}

- static __poll_t aim_poll(struct file *filp, poll_table *wait)
-static unsigned int comp_poll(struct file *filp, poll_table *wait)
++static __poll_t comp_poll(struct file *filp, poll_table *wait)
{
- struct aim_channel *c = filp->private_data;
+ struct comp_channel *c = filp->private_data;
- unsigned int mask = 0;
+ __poll_t mask = 0;

poll_wait(filp, &c->wq, wait);