linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yongji Xie <xieyongji@bytedance.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: "Michael S. Tsirkin" <mst@redhat.com>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	Linux Next Mailing List <linux-next@vger.kernel.org>,
	Thomas Gleixner <tglx@linutronix.de>
Subject: Re: linux-next: manual merge of the vhost tree with Linus' tree
Date: Mon, 6 Sep 2021 10:56:01 +0800	[thread overview]
Message-ID: <CACycT3viMCxcsg1GXDA1kmcv3n56nDj3a3OpHb3sF40SD9tSEg@mail.gmail.com> (raw)
In-Reply-To: <20210906122806.2ca7e715@canb.auug.org.au>

On Mon, Sep 6, 2021 at 10:28 AM Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> 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.
>

Yes, I think we can safely remove the commit 0afdb2abbff3 ("eventfd:
Export eventfd_wake_count to modules") after the commit b542e383d8c0
applied.

Thanks,
Yongji

  reply	other threads:[~2021-09-06  2:56 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-06  2:28 linux-next: manual merge of the vhost tree with Linus' tree Stephen Rothwell
2021-09-06  2:56 ` Yongji Xie [this message]
  -- strict thread matches above, loose matches on Subject: below --
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=CACycT3viMCxcsg1GXDA1kmcv3n56nDj3a3OpHb3sF40SD9tSEg@mail.gmail.com \
    --to=xieyongji@bytedance.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mst@redhat.com \
    --cc=sfr@canb.auug.org.au \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).