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;
Message-ID: <55f4b515-1d1c-fd3e-0f93-4cda45261c91@suse.com>
Date:   Tue, 10 May 2022 10:43:07 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101
 Thunderbird/91.8.1
Subject: Re: linux-next: manual merge of the folio tree with the btrfs tree
Content-Language: en-US
To:     Stephen Rothwell <sfr@canb.auug.org.au>,
        Matthew Wilcox <willy@infradead.org>,
        David Sterba <dsterba@suse.cz>
Cc:     David Sterba <dsterba@suse.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>
References: <20220510183908.7571cb73@canb.auug.org.au>
From:   Filipe Manana <fdmanana@suse.com>
In-Reply-To: <20220510183908.7571cb73@canb.auug.org.au>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 2
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?Uks2VWhJMmV1WndkZ0ZsQlI5dUFUN0VmTGZYYjNvQ1IxVFlGdTBHRDBBekY0?=
 =?utf-8?B?cERzVkh1SUE3ZHdyMGt5Zzh5citvRXlGQTZGOWlXVjRSRVp2RGt0QmZ6RUZz?=
 =?utf-8?B?d2N5cnhCMUhqUmZxdFo4c2RtVGh0b01jUnRtUkZtOVk5T3JvSE9GSU52eWti?=
 =?utf-8?B?OFphK2NjV0pxTllkR1UraFNRMEZUWUFpbWUybkF3Uit6WGk2SThmK1dHcFV1?=
 =?utf-8?B?VzJXTnpIa3ZzaHI0Wm5yYytqZkM2OWJCSDRSckxLSjYxRWtOMU1EUnBHTTFK?=
 =?utf-8?B?VnpoTE5uSzVST2oyWm5HQXFzUWhJQTRQYmhYZFNqS25VMTY0MDY1ZlRrU0ln?=
 =?utf-8?B?N3BTQ09JdjByRGVRRFVYUk51UTVTMnhzaElCK0dIZ3VwRm1USjlzZHVjT3Nv?=
 =?utf-8?B?aDlTYVJRK0tyU3hyNXNDQXhGakFZZFJzM3RmK05EcnBUR3BxVTAzZGhoNjg5?=
 =?utf-8?B?RnFtRE9rNllBRmVaeDQ5ZmkyaXhPR2JOZWhkbFFZWkNOVVk3NHZmL0l0RDV1?=
 =?utf-8?B?akcyUlNxdU1IYnhNQVNmS3lRRFMyM3dSdWE0Mk1lQjVIQks2TU9teFpZd3c0?=
 =?utf-8?B?OHZhc29adlRmczRyaW9RU3FVTzBwSnJhOTQzbko2ZFRMQkdsRjVqOGdQMmRh?=
 =?utf-8?B?MGtGRUNiaVpsWCt5WFkyRDlXS21XQUxBQmJTbG00MStnbURaL3hmMVZnSU1C?=
 =?utf-8?B?aFpRVUhhd25oZC9Tb1RDNjFFcWRlMlh0OGpmSEVDWEVpdGlmc0ZYb1RDZUN0?=
 =?utf-8?B?Mm81Ykp2WFV6UnJ2Y2kxUjk0QldjWStzd2NZM1BBRlR0MENXMnNydmhRVkNu?=
 =?utf-8?B?WHVUZDJLSVU4ZmQ0bnRVMTRzc1VMWSs2QldNZ040WDFUYVk1UUk0VmVOdmp1?=
 =?utf-8?B?TEpJdUlWMjZxZlhDRlFENmJRdnF6cnBheEtzMEx3MjVaZ0NlVUVVNkFPeFpt?=
 =?utf-8?B?dmR0OElMbHlETkRLVXVlREdIL29VVkFwQXJWQXpva2gzUGFGOWw1KzAzcXNq?=
 =?utf-8?B?UnJkQzBkRjdGMUdpdDBxOWRUL2gxem1MT0hCRnhEcnpuck00N3JEcFNEVUZl?=
 =?utf-8?B?U1c2aUtweVZLR1pBQWpMcHltam9mS1p6ZFVWbERQUkdlcHFZbFJzazg5M01N?=
 =?utf-8?B?bEpZR2dJNUNpRVlMNnYyMGFuckNGem5UVnZZN3RiL1p2VFNybXBZdWJ1Nm9z?=
 =?utf-8?B?QUYyS2dFVXhxWlBLZXFBZy9WYXdXQmNFNkhSV1poeFVMS2tJTHdxRU5EbGl5?=
 =?utf-8?B?SXNvVDY2WFFOeXZENWg2UnAwUythTi9jRkFYSGdvdXFyaFpEZm1wcTlaVFVz?=
 =?utf-8?B?NDBjM1dlbzh1emNmZFB3dThiT25JMVBqOGl6Nm50dDhIYXA4WXpqN2Rod3pn?=
 =?utf-8?B?MzFCaVJIYmdxS2YvdVRicGQrdGdhN05UQm9iSVNCUUxEVDZnWWdFWGE0aVFp?=
 =?utf-8?B?eFpXZGFDblY1UVl1cDJGdVNOd2w1Z3FtZEE0V3Q4MEV2dmdncnZyeVN0cGpp?=
 =?utf-8?B?RndhSGxXZzFUVEp1MHRnbWlnTkhWemE4bVVRUkRMK3poZS8rWEJGRmttSm5C?=
 =?utf-8?B?MGllc0FxRVhnSlpNaysydTZDUi9xeUxBR1ZBQy8zU1F2eXJPZ05xSkpjNTZZ?=
 =?utf-8?B?cEIzSXk2T0ZFclMyT1Q2NTNjZURyNEFzeTA0Mzcvcjg3dVAyUEc2dlA3Mk16?=
 =?utf-8?B?RWVURnJTdTRFZXc2ekRVOEJpbG10YmdSOGtxUkFlZGFaNDJZaWxHVGVYMWlw?=
 =?utf-8?B?N0pKRnM1YkJwN1hUQkdDVEEweGROeFBVNlhDR2gyV1ljYk1pdjRxd1F2ZEpE?=
 =?utf-8?B?UkM5TmdJRzlRRXRlVjdoS1BlRmdsd3ozUk43d3d2L3h0bGM3S29kcCt4VVdG?=
 =?utf-8?B?TjJMcUFlMVk2dVVmL1gzVElBaldlZkhPalVOc0hCaDFsdjRhQXRhcGlpajlu?=
 =?utf-8?B?UTVNQTRMakNxMkREV2NkWGJ4YkZoRTBXOFJxWEtSUGZMSmZlMVdmRHhFZ3FV?=
 =?utf-8?B?NWczWFNsQUVySmI1eGRwN0Zqd1pQb2pTa2FmVnhSUWZPWmMwWUl2aTVTUHlK?=
 =?utf-8?B?Q3BFakVEN3dUYmRYQXFGVlpQbWxjUHFwUlZsanZXdGJUelRIWDVpcFJOOUN2?=
 =?utf-8?B?Z0poOUMzWWdadVBZTkIvZklxUlN0bERKdy9LS2RxSTNuUjJuY2MzUE04ajhO?=
 =?utf-8?B?ekZwZnBFRXUyQk1mMkhNSG5OL2lKN1A1N2FCNkE3NWJ1ZVFLeHVIWDZGeURk?=
 =?utf-8?B?Q0FRQ2ZOeTNtR0laM1U4MjJUb2E2Z1lOUGI5cDRNL3E4ZmpKSmZtSzd3L3Fm?=
 =?utf-8?B?OHJIRjgzZ3B0OGQxajVuckozeFhSdE1SY2grMk4zd2xWMnNMckhKOWV0Y0Va?=
 =?utf-8?Q?xoH/gbDSVQAvJ5NnOEJjDY9lYaAfd6poDsHZLe4E42V4Y?=
X-MS-Exchange-AntiSpam-MessageData-1: PFyZQ7c8AC6BDQ==
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 8b1d12dd-71cf-4b6c-b547-08da32697ddd
X-MS-Exchange-CrossTenant-AuthSource: AM5PR0402MB2785.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2022 09:43:09.2389
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: 2xRMt84WMwHZsPAs6x0oZ/jrkJmyuZzrrAfKGvcXzof/urWdzJoMwC1Lgr4zy62HmGdhB5cSpV5CN3lxzIbi2Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PAXPR04MB8288
X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED
        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


On 10/05/22 09:39, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the folio tree got a conflict in:
> 
>   fs/btrfs/send.c
> 
> between commit:
> 
>   d1a1a97304b4 ("btrfs: send: keep the current inode open while processing it")
> 
> from the btrfs tree and commit:
> 
>   2ebdd1df3166 ("mm/readahead: Convert page_cache_async_readahead to take a folio")
> 
> from the folio tree.
> 
> I fixed it up (I think - see below) and can carry the fix as

Looks correct to me.
Thanks.

> 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.
>