From: Stephen Rothwell <sfr@canb•auug.org.au>
To: "Michael S. Tsirkin" <mst@redhat•com>
Cc: Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Thomas Gleixner <tglx@linutronix•de>,
Xie Yongji <xieyongji@bytedance•com>
Subject: linux-next: manual merge of the vhost tree with Linus' tree
Date: Mon, 6 Sep 2021 12:28:06 +1000 [thread overview]
Message-ID: <20210906122806.2ca7e715@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 780 bytes --]
Hi all,
Today's linux-next merge of the vhost tree got a conflict in:
fs/eventfd.c
between commit:
b542e383d8c0 ("eventfd: Make signal recursion protection a task bit")
from Linus' tree and commit:
0afdb2abbff3 ("eventfd: Export eventfd_wake_count to modules")
from the vhost tree.
I fixed it up (I removed eventfd_wake_count as I could not see any added
use for it) 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
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2021-09-06 2:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-06 2:28 Stephen Rothwell [this message]
2021-09-06 2:56 ` linux-next: manual merge of the vhost tree with Linus' tree Yongji Xie
-- strict thread matches above, loose matches on Subject: below --
2025-11-17 5:51 Stephen Rothwell
2025-11-17 6:29 ` Stephen Rothwell
2025-11-17 15:21 ` Jonathan Corbet
2022-12-19 23:05 Stephen Rothwell
2019-12-04 3:00 Stephen Rothwell
2019-12-09 0:40 ` Stephen Rothwell
2019-01-03 1:39 Stephen Rothwell
2015-07-24 3:59 Stephen Rothwell
2015-07-08 1:43 Stephen Rothwell
2013-05-09 2:04 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=20210906122806.2ca7e715@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mst@redhat$(echo .)com \
--cc=tglx@linutronix$(echo .)de \
--cc=xieyongji@bytedance$(echo .)com \
/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