| Message ID | 20230413145239.3529907-1-broonie@kernel.org |
|---|---|
| State | New |
| Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org>
Delivered-To: ouuuleilei@gmail.com
Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1104533vqo;
Thu, 13 Apr 2023 08:06:39 -0700 (PDT)
X-Google-Smtp-Source:
AKy350Z1VYToJSryFV/1318E9MZCwq/Mtn0ogVrqW9Wj+2bK2HkZk2WcRA2ZU6T905rJb/SlX52t
X-Received: by 2002:a67:f583:0:b0:417:e07:775e with SMTP id
i3-20020a67f583000000b004170e07775emr832677vso.2.1681398398809;
Thu, 13 Apr 2023 08:06:38 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1681398398; cv=none;
d=google.com; s=arc-20160816;
b=NRMvPRIVuF/b8aUPvtL1h02FJ61h83hBbhEEfVVFdNE9YOCEZIom/WaaaWZGv3ncqe
uZ+ANX4VeZiPeFUCYDhkc/M0ThOd3KzDRn3K2nv4nI09G/mDVTzCHiZT7AZqkpj9vaN9
HqK9IWAVQLM8/j/2eSKH5Rt99mmK7TXgxRBl65EA+oXfRCkkEkq5TvEQDQoP6wH4Yv3S
GMCreCOXt6gjyc3voARRF/HxoEE8icPefhDUIpcvjMLLZNfZ5BxCuMxIr/mkyugTO6wh
KQsTrZ/SOhVRmM/esIV5fw9bOeV42NXUOhnBauA5hxjgh8cDleQtNgO3YcvcPdQ45y53
i3JA==
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com;
s=arc-20160816;
h=list-id:precedence:content-transfer-encoding:mime-version
:message-id:date:subject:cc:to:from:dkim-signature;
bh=xwG1isVpN2YigJtb3VNcB108Bahu74mUGsU93aLkPfc=;
b=rAwfIhedtJiSW4tv4Vgxshc/TkjQW+cR2EcT0MalwaW7wvr3dwr/3sQeWnferXzxGB
JljRZF2TSDdnljEn05f/Qibdo/a0HwH5r3CytuW/bvJ0O3J/Hqap19Tlvihrp4YB7LNs
jEGNwnHhwqZ3JcO4egQMGUF+NE/ZKZjfXAAadxU7hCyXH0o97z467xhZpLlQCrCmfoOY
+1M84Y8Rko1vkKxaRexjF8KV+eo7lrGSke0iWQ6t6uEo3O1NFGQk8D10Yd2v35ESlUF4
yn9Us/OB4CXvHzWwkewbUxHeo/9sIxlCG5It89q2Of6kkAjFw0BzQ/cZ4w3zgmEJUWsi
VITQ==
ARC-Authentication-Results: i=1; mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eJmdsAqb;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20])
by mx.google.com with ESMTP id
o17-20020a05610232d100b0042c5422d3f4si433110vss.542.2023.04.13.08.06.20;
Thu, 13 Apr 2023 08:06:38 -0700 (PDT)
Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
client-ip=2620:137:e000::1:20;
Authentication-Results: mx.google.com;
dkim=pass header.i=@kernel.org header.s=k20201202 header.b=eJmdsAqb;
spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org
designates 2620:137:e000::1:20 as permitted sender)
smtp.mailfrom=linux-kernel-owner@vger.kernel.org;
dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
id S230320AbjDMOwr (ORCPT <rfc822;peter110.wang@gmail.com>
+ 99 others); Thu, 13 Apr 2023 10:52:47 -0400
Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47942 "EHLO
lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
with ESMTP id S229930AbjDMOwq (ORCPT
<rfc822;linux-kernel@vger.kernel.org>);
Thu, 13 Apr 2023 10:52:46 -0400
Received: from dfw.source.kernel.org (dfw.source.kernel.org
[IPv6:2604:1380:4641:c500::1])
by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 72E5099;
Thu, 13 Apr 2023 07:52:44 -0700 (PDT)
Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by dfw.source.kernel.org (Postfix) with ESMTPS id 111E360F3C;
Thu, 13 Apr 2023 14:52:44 +0000 (UTC)
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 19746C433EF;
Thu, 13 Apr 2023 14:52:41 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
s=k20201202; t=1681397563;
bh=C5RPtjfJHy3vGZq9VS1zqyK+5+lTi0Wy962NJzcAZ/0=;
h=From:To:Cc:Subject:Date:From;
b=eJmdsAqbh7wdm4KJcGA080EFTOb5vqr9PCSwPsSGPeCkq0dQLygobv4vPCRRb7HRc
Sv07AS+bhTrL6M/NV0qxMDmr6Jk9w2wLd/QZTWlyRcDKVv8LkmfP1xyGVWvHwzPUuW
e/Bbz3yj+DXK7M9gnVVZc/ARFLSCmaALj5VvSFC6fuHw5suYGss2a8IU6Vi7SAPXp6
B3hfNjBbyLzco3/xBDL59CzXk287uUBpuXjD8vKw7H1udoGp6FA9hXOvI/BqT8/FZv
DELjX6k3RBcSmE0ODW9pHgtBpXYhze//Y1JvtgC1bO44Pw2jzgMU7bUxoxL/pmP9m0
4+w7wTW1RVbeA==
From: broonie@kernel.org
To: Theodore Ts'o <tytso@mit.edu>
Cc: Andrew Morton <akpm@linux-foundation.org>,
Christoph Hellwig <hch@lst.de>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>,
Matthew Wilcox <willy@infradead.org>
Subject: linux-next: manual merge of the ext4 tree with the mm-stable tree
Date: Thu, 13 Apr 2023 15:52:39 +0100
Message-Id: <20230413145239.3529907-1-broonie@kernel.org>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?=
X-GMAIL-THRID: =?utf-8?q?1763073828988383466?=
X-GMAIL-MSGID: =?utf-8?q?1763074007555914446?=
|
| Series |
linux-next: manual merge of the ext4 tree with the mm-stable tree
|
|
Commit Message
Mark Brown
April 13, 2023, 2:52 p.m. UTC
Hi all,
Today's linux-next merge of the ext4 tree got a conflict in:
include/linux/pagemap.h
between commit:
263e721e3ba1f ("mm: make mapping_get_entry available outside of filemap.c")
from the mm-stable tree and commit:
e999a5c5a19cf ("fs: Add FGP_WRITEBEGIN")
from the ext4 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.
+++ b/include/linux/pagemap.h
@@@ -504,9 -504,11 +504,11 @@@ pgoff_t page_cache_prev_miss(struct add
#define FGP_NOFS 0x00000010
#define FGP_NOWAIT 0x00000020
#define FGP_FOR_MMAP 0x00000040
-#define FGP_ENTRY 0x00000080
-#define FGP_STABLE 0x00000100
+#define FGP_STABLE 0x00000080
+ #define FGP_WRITEBEGIN (FGP_LOCK | FGP_WRITE | FGP_CREAT | FGP_STABLE)
+
+void *filemap_get_entry(struct address_space *mapping, pgoff_t index);
struct folio *__filemap_get_folio(struct address_space *mapping, pgoff_t index,
int fgp_flags, gfp_t gfp);
struct page *pagecache_get_page(struct address_space *mapping, pgoff_t index,
diff --cc include/linux/pagemap.h index fdcd595d22944,51b75b89730ed..0000000000000 --- a/include/linux/pagemap.h