From patchwork Wed Nov 22 01:55:39 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: 13463861
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="LSt7nN3k"
Received: from gandalf.ozlabs.org (mail.ozlabs.org
 [IPv6:2404:9400:2221:ea00::3])
	by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 11ADD191;
	Tue, 21 Nov 2023 17:55:43 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au;
	s=201702; t=1700618141;
	bh=7FPZrQpXckwEBiIN9Y1g3A9pS2bcgEzzAWiPT+SeB5I=;
	h=Date:From:To:Cc:Subject:From;
	b=LSt7nN3kuHNFZSSk8DWiD852msXu5uKO6t7YWtdui95oa1Ic65OCitI9uWln5JUro
	 Qt9fSovUvXI64CfHf+E8FO6fmbB8rCeVscBtkxY9GyCfYK8vkb/ejTU4/iEU4pQL1A
	 A7hSIuay7LpCyOV5hKsdUFwDcT6tbzsz6j64knbVIUjYev5pFHel3ZUV/tOo2mlCy6
	 fODth7pB8EQdZAr7VPDVpgE7dkhKfj5e3KucU4RwKv0t59uFR0ostTV59pp22x74vV
	 oj6z+Ip0ssGMNEExbamkaiR/SXm0yr7ijL+FN8deWYgREhMSHT4phWu3FqZMCiTcIL
	 Atof8VF48yPeg==
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 4SZkq03tmpz4xNt;
	Wed, 22 Nov 2023 12:55:40 +1100 (AEDT)
Date: Wed, 22 Nov 2023 12:55:39 +1100
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>, KVM <kvm@vger.kernel.org>,
 Christian Brauner <brauner@kernel.org>
Cc: Christoph Hellwig <hch@lst.de>, Linux Kernel Mailing List
 <linux-kernel@vger.kernel.org>, Linux Next Mailing List
 <linux-next@vger.kernel.org>, Sean Christopherson <seanjc@google.com>,
 Vlastimil Babka <vbabka@suse.cz>
Subject: linux-next: manual merge of the kvm tree with the vfs-brauner tree
Message-ID: <20231122125539.5a7df3a3@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:

  include/linux/pagemap.h

between commit:

  762321dab9a7 ("filemap: add a per-mapping stable writes flag")

from the vfs-brauner tree and commit:

  0003e2a41468 ("mm: Add AS_UNMOVABLE to mark mapping as completely unmovable")

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 include/linux/pagemap.h
index 06142ff7f9ce,bf2965b01b35..000000000000
--- a/include/linux/pagemap.h