From patchwork Wed Dec 20 02:52:51 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Stephen Rothwell <sfr@canb.auug.org.au>
X-Patchwork-Id: 13499463
Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8A4E78488;
	Wed, 20 Dec 2023 02:52:56 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
 dmarc=pass (p=none dis=none) header.from=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
 spf=pass smtp.mailfrom=canb.auug.org.au
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au
 header.b="pHFC0HeD"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1703040775;
	bh=u+n7djgZgZC5+nAlDbG46jcmuKzAaYJMrC+bvBoFM0c=;
	h=Date:From:To:Cc:Subject:From;
	b=pHFC0HeDZMm6Nyp7PFD9Q3ura+L1lAAv6lwFHd14ZzBaxFyYuwZw//HbmrbbXPvt7
	 52PAJt63HgWKz7Ys4p/n7Ud1JEDRNIrCySKyf96CFDzwTOX96cUIZCHfZz4S/O0Wnd
	 z1/9tOGtwu7hYivg84JoWZU94QVbVHSgyjFdfXHdUBb5B0qa3fJc30r8WLt9LpuglQ
	 hM8oxnSlThBtCK1UXmaQvEqTwcrG/QOcoq7HF3Terh1f0uN5jxacRtNefHfraL32h/
	 1LEpzSNK7OTXwza6jJnrpSnghgLXgllT9GXPzTPX1TG3gYdyDY8fcfI++zgSJyrgHk
	 1YJNlndx+Z/jQ==
Received: from authenticated.ozlabs.org (localhost [127.0.0.1])
	(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest
 SHA256)
	(No client certificate requested)
	by mail.ozlabs.org (Postfix) with ESMTPSA id 4Svym55Pdkz4wdD;
	Wed, 20 Dec 2023 13:52:53 +1100 (AEDT)
Date: Wed, 20 Dec 2023 13:52:51 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>, Jens
 Axboe <axboe@kernel.dk>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next
 Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: manual merge of the kvm tree with the block tree
Message-ID: <20231220135251.67a61536@canb.auug.org.au>
Precedence: bulk
X-Mailing-List: kvm@vger.kernel.org
List-Id: <kvm.vger.kernel.org>
List-Subscribe: <mailto:kvm+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:kvm+unsubscribe@vger.kernel.org>
MIME-Version: 1.0

Hi all,

Today's linux-next merge of the kvm tree got a conflict in:

  io_uring/io_uring.c

between commit:

  6e5e6d274956 ("io_uring: drop any code related to SCM_RIGHTS")

from the block tree and commit:

  4f0b9194bc11 ("fs: Rename anon_inode_getfile_secure() and anon_inode_getfd_secure()")

from the kvm 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.

diff --cc io_uring/io_uring.c
index bc0dc1ca9f1e,db3f545ddcac..000000000000
--- a/io_uring/io_uring.c