From patchwork Wed Dec 14 21:36:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 33381 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp486663wrn; Wed, 14 Dec 2022 13:49:34 -0800 (PST) X-Google-Smtp-Source: AA0mqf5UBIjAAzstmzWLEMnGlpaVMFvRDOAY/ubIK8FcuEzKoO/FXoBlz7DrIcTuj1rG0LsFfmns X-Received: by 2002:a17:907:d008:b0:7ad:8a7a:1a44 with SMTP id va8-20020a170907d00800b007ad8a7a1a44mr1555407ejc.47.1671054574651; Wed, 14 Dec 2022 13:49:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671054574; cv=none; d=google.com; s=arc-20160816; b=EkCCNldGhlP3MHotp0TaFq17jMDLTIqZHJypyC9G8uxQkslW0Dck1Ka4GuX6qKiVzK LEhEgwivHRttW3MRCz9Nc7xUSoy4QIkGlfOFlu6n8Tj3WMP9kF7k/BcpKGNfnn0694Fn owBTacuXWBGZB0n3BtdaRB+NJq1soqZZEr1g8fiDIW8k++KgduZbiRmGBCEITGK+anzU 46/Z9Q41vSJaK2dmnrbjlt9ADTQ8fTfy7H5NWctXsCoqqFLnH2ri3IilEEzkzPpZmguK ui18IDl9K2z+AoQY/fBepeAjj92aU+emS5WkOzVwZ+Hz0P3DiK7JeC2SCNyPFIM7F/xo UoAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=oWX9mpT17ur8DOuIMsmVAj3LF7Xrb3G66buPkRIts6g=; b=vetIy53GhU7zcyckhqRNoU0dEKiWXdIMTTt+/9vL87cjbldSl0aVCRlaQHQnmJtUlM ZjUDP1e4/Z1yeHtFj1kYAUWfZGIoorhQ5qmo49Cn1Coip1udh96VS/bCl5UytrSJftNI MNAMcuIl4/MqbKPMtjMKx8hw2ERQ1bi+IMSo60dY+mL/y0VMf4bNn5z9GAOz7BP+yTWa +4YAKm2DAbeVXYqO3Pq+CS77YGuO9ZwyFkWeLuJaGCpXiLvaCqYm7ppAhWfl9FyUjoqR Jpslry7UiYLCkQ0pluS9E7XuI6HMoCbrWMmhv9AONsklZO/nqIJ89H/sfNYCiUBQbEw1 Sl8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=XxhZFerT; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id di21-20020a170906731500b007c0ab08889fsi13007945ejc.242.2022.12.14.13.49.09; Wed, 14 Dec 2022 13:49:34 -0800 (PST) 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=@canb.auug.org.au header.s=201702 header.b=XxhZFerT; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229734AbiLNVgN (ORCPT + 99 others); Wed, 14 Dec 2022 16:36:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36144 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229561AbiLNVgL (ORCPT ); Wed, 14 Dec 2022 16:36:11 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B2AFE099; Wed, 14 Dec 2022 13:36:09 -0800 (PST) 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 ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4NXTFL4TWHz4xN4; Thu, 15 Dec 2022 08:36:06 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1671053766; bh=oWX9mpT17ur8DOuIMsmVAj3LF7Xrb3G66buPkRIts6g=; h=Date:From:To:Cc:Subject:From; b=XxhZFerTuwoJSOPVskTHWstoGlXXDWtpamlomjI8VzzJ4I/IpY+sUIq9X6h1i1N3N XcG1YD5sSfEF5ARU/o0F0HK7Edmmn+CF0W4mRg1UhQdosWd9gZTo+0Qq6oqNfiHKKs 78txaUt3igsqdnlzI3+XhzRHdL2b/13SfkjWXern7YYtGtulcGhiCQKijMRMndo9WN vbjXEaP6Jhxi1FzWes2iHMg06/RZ33Nm+t83nF5arPsGSV7a7r0X9/NQY61sMJzx/o gTehgJ1nUf2nTabPqTXNJIGhpkmOhqzx3Gys61xLxiVvdgTdQpsdneDH1zywB8QHXD BmGAhyaxXoR3g== Date: Thu, 15 Dec 2022 08:36:04 +1100 From: Stephen Rothwell To: Steven Whitehouse , Bob Peterson Cc: Andreas Gruenbacher , Dave Chinner , Dave Chinner , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the gfs2 tree with Linus' tree Message-ID: <20221215083604.5a920366@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-2.0 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,SPF_HELO_PASS,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752227721822714126?= X-GMAIL-MSGID: =?utf-8?q?1752227721822714126?= Hi all, Today's linux-next merge of the gfs2 tree got a conflict in: include/linux/iomap.h between commit: d7b64041164c ("iomap: write iomap validity checks") from Linus' tree and commit: 2057bcfa562b ("iomap: Move page_done callback under the folio lock") from the gfs2 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/iomap.h index 0983dfc9a203,bd6d80453726..000000000000 --- a/include/linux/iomap.h