From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Sean Christopherson <seanjc@google•com>,
Christian Brauner <brauner@kernel•org>
Cc: Ackerley Tng <ackerleytng@google•com>,
Fuad Tabba <tabba@google•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Shivank Garg <shivankg@amd•com>
Subject: linux-next: manual merge of the kvm-x86 tree with the vfs-brauner tree
Date: Tue, 25 Nov 2025 15:54:55 +1100 [thread overview]
Message-ID: <20251125155455.31c53cf9@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1077 bytes --]
Hi all,
Today's linux-next merge of the kvm-x86 tree got a conflict in:
virt/kvm/guest_memfd.c
between commit:
ca3f437d9769 ("kvm: convert kvm_arch_supports_gmem_init_shared() to FD_PREPARE()")
from the vfs-brauner tree and commits:
497b1dfbcacf ("KVM: guest_memfd: Rename "struct kvm_gmem" to "struct gmem_file"")
a63ca4236e67 ("KVM: guest_memfd: Use guest mem inodes instead of anonymous inodes")
e66438bb81c4 ("KVM: guest_memfd: Add gmem_inode.flags field instead of using i_private")
from the kvm-x86 tree.
I fixed it up (I just used the latter version as the conflict is a bit
difficult) 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.
If somone can provide a better resolution, that would be nice.
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2025-11-25 4:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-11-25 4:54 Stephen Rothwell [this message]
2025-11-25 14:49 ` linux-next: manual merge of the kvm-x86 tree with the vfs-brauner tree Sean Christopherson
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=20251125155455.31c53cf9@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=ackerleytng@google$(echo .)com \
--cc=brauner@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=seanjc@google$(echo .)com \
--cc=shivankg@amd$(echo .)com \
--cc=tabba@google$(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