From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 71BC2242D7B for ; Tue, 25 Nov 2025 14:49:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764082186; cv=none; b=N+psnN1a7/uKQT69nfH8pHnMqBOtKwLmdBpBkxjrcmAYEmp/0M8NotFtbZN8czMqo6i4LIDZ+zkjHGwf6bxvqlzXjW0aSxgQnJkF432hzDEO4Guf6mbbyQGQaXX8QplgYHEVkHS6vQSEZOq18KoKddxvsyO/Qd6zsBjs/q6pxE4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1764082186; c=relaxed/simple; bh=4cKCw86HvohPctVdf2BgZC5nU2ans+hmUsT2tp/yN5g=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=Tzd5cIR3KSRekoD7Vv0U/xHIiZphzPh+5TjVSwWN0AqqGWU86lwfGc9FFFJDnYU+piDjszZK5i+CL99z+gBI/3h8FnOx3pixSAPcGFSDZmSHFAfF+V02j6RL6n9h6UwXqUT/BcYEFiZXnebTSbIAe0iHxBm23PE0B5BnlsIxuXs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=rdHPlceK; arc=none smtp.client-ip=209.85.214.201 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--seanjc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="rdHPlceK" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-297e5a18652so62763505ad.1 for ; Tue, 25 Nov 2025 06:49:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1764082185; x=1764686985; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=5d8EZM5rG9KUo3VoUZ6ZoE8IgaZKmyi6+M8TDpzTPTs=; b=rdHPlceKuO9d4isSLkcviLe6+84uWutAQdZjDOYA0XZK+PNR1CzqJza/1s3MtjH7gZ txQtmuv7QuFIECNqmUpcJvtVqoMYEwf9k+JwH6Z1vGjhJQeUpFHEaZum33KBb6Dpk3ns 6iVaku20FY5+cuVkm12j36QYl/+2I0ZLZQXJPW6XStoeM56QckPdNj5b/GHwuyMHaRWP Zdl8pd8xoqJxQT8SggU7b4LS+I/vFPiqR0owzX3km0iqu3hq7zt655HKb1TPyRyBntCd 4XHJHKcpU2++FOV9uEXFwmra29Nb9VO8mNeMMYje6oR4WCVLq9sKhjnjlRJkT6ddMYue SV2Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764082185; x=1764686985; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5d8EZM5rG9KUo3VoUZ6ZoE8IgaZKmyi6+M8TDpzTPTs=; b=SMEuU9UWnO+441Iu0QymESmfHaOpO8bid7wV8mnuL1jc0Ow29lpQMcrLlLpX/P13uV zJWnjYvsEOr7GNJtdYsgXUi++XMlZ+e3kujuqigwKA8O+rhVHICg6IMHX+aGZFnTVAJZ kuQqIkJ5VLzBLIIVOtpkb/0laZpzZOKKUufFuOAkmP+b+T2m5dwbcdaH6BgNmuHX9z4K WPI8yXtMGkunvcv/9MWr1ur21v2XZH+EjuFz81LUwFimE1INf6PKmANjRPTkUP6pJXB4 +hAbwGdibkrDSDDoyxbnzj2muWgTJufpL4cnRvcM46kCNIux6LEbTPvZ233Vo2eB8Y+k MwFA== X-Forwarded-Encrypted: i=1; AJvYcCWuXxpJi4BbPqLMjEuQhks3ZqQfV0S3pukTiznFHEn9lkfUov6vE3OnauMlWf7ABAdn2DegriMuXriH0Fs=@vger.kernel.org X-Gm-Message-State: AOJu0YyLUzZu48NiCJGH4h+v7yq6Mgr/1oitl83rIbh2nmE2alIsJtCv 1bbEKVx0lAbyfNqsDS37yZkCO2b60A8Ah4FophGfOgz/CRk3cNAhW0l8FOzGjGgYZAuN4214Ynm aWUx47w== X-Google-Smtp-Source: AGHT+IGKL7OwOq/Auaxg4ELc22EOqh6jc4Wk9xeVwMsdPSWOOn22goFtIg3JOHPdLnbP2LC9QCTznluKS6s= X-Received: from plhw14.prod.google.com ([2002:a17:903:2f4e:b0:290:a36a:bf99]) (user=seanjc job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1a06:b0:297:db6a:a82f with SMTP id d9443c01a7336-29b6c5088ccmr194114095ad.24.1764082184827; Tue, 25 Nov 2025 06:49:44 -0800 (PST) Date: Tue, 25 Nov 2025 06:49:43 -0800 In-Reply-To: <20251125155455.31c53cf9@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20251125155455.31c53cf9@canb.auug.org.au> Message-ID: Subject: Re: linux-next: manual merge of the kvm-x86 tree with the vfs-brauner tree From: Sean Christopherson To: Stephen Rothwell Cc: Christian Brauner , Ackerley Tng , Fuad Tabba , Linux Kernel Mailing List , Linux Next Mailing List , Shivank Garg Content-Type: text/plain; charset="us-ascii" On Tue, Nov 25, 2025, Stephen Rothwell wrote: > 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. Christian, please drop your KVM changes from and send "standalone" KVM-only patches after the FD_{ADD,PREPARE}() infrastructure has landed. Shoving things like that into -next just before the merge window, without having been Cc'd to the relevant maintainers or even kvm@, without changelogs, and on a short week for many of us, is not acceptable.