From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Juergen Gross <jgross@suse•com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle•com>,
Stefano Stabellini <sstabellini@kernel•org>,
Boris Ostrovsky <boris.ostrovsky@oracle•com>,
Xen Devel <Xen-devel@lists•xensource.com>
Cc: Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linus Torvalds <torvalds@linux-foundation•org>,
Al Viro <viro@zeniv•linux.org.uk>
Subject: linux-next: manual merge of the xen-tip tree with Linus' tree
Date: Fri, 16 Feb 2018 12:04:32 +1100 [thread overview]
Message-ID: <20180216120432.2f4e9c89@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1533 bytes --]
Hi all,
Today's linux-next merge of the xen-tip tree got a conflict in:
drivers/xen/pvcalls-front.c
between commit:
a9a08845e9ac ("vfs: do bulk POLL* -> EPOLL* replacement")
from Linus' tree and commit:
1e7dbff356e5 ("pvcalls-front: introduce a per sock_mapping refcount")
from the xen-tip 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/xen/pvcalls-front.c
index 753d9cb437d0,ca5b77309c7d..000000000000
--- a/drivers/xen/pvcalls-front.c
+++ b/drivers/xen/pvcalls-front.c
@@@ -963,20 -942,13 +942,13 @@@ __poll_t pvcalls_front_poll(struct fil
{
struct pvcalls_bedata *bedata;
struct sock_mapping *map;
- int ret;
+ __poll_t ret;
- pvcalls_enter();
- if (!pvcalls_front_dev) {
- pvcalls_exit();
+ map = pvcalls_enter_sock(sock);
+ if (IS_ERR(map))
- return POLLNVAL;
+ return EPOLLNVAL;
- }
bedata = dev_get_drvdata(&pvcalls_front_dev->dev);
- map = (struct sock_mapping *) sock->sk->sk_send_head;
- if (!map) {
- pvcalls_exit();
- return EPOLLNVAL;
- }
if (map->active_socket)
ret = pvcalls_front_poll_active(file, bedata, map, wait);
else
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2018-02-16 1:04 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-02-16 1:04 Stephen Rothwell [this message]
2018-02-16 1:55 ` linux-next: manual merge of the xen-tip tree with Linus' tree Stefano Stabellini
-- strict thread matches above, loose matches on Subject: below --
2021-11-02 3:25 Stephen Rothwell
2015-10-07 2:12 Stephen Rothwell
2015-08-14 3:56 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=20180216120432.2f4e9c89@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Xen-devel@lists$(echo .)xensource.com \
--cc=boris.ostrovsky@oracle$(echo .)com \
--cc=jgross@suse$(echo .)com \
--cc=konrad.wilk@oracle$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=sstabellini@kernel$(echo .)org \
--cc=torvalds@linux-foundation$(echo .)org \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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