From patchwork Tue Jun 27 00:39:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 113162 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7856016vqr; Mon, 26 Jun 2023 17:50:09 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4u6he2LX4iSeJ5qw9/w4+mrFNZ+MGabFjP1FvwaV02hoGU1xBnFBnrNoCVZt+CYQ9zYLVM X-Received: by 2002:a50:ed05:0:b0:51d:8971:4325 with SMTP id j5-20020a50ed05000000b0051d89714325mr3857679eds.9.1687827008803; Mon, 26 Jun 2023 17:50:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687827008; cv=none; d=google.com; s=arc-20160816; b=Nieq8MGMXxEOPKkrUkxwsiN25V7zo6QlKoIIP94rvLElSKvDqtuGeq/0OrqNnWPj0s zyKFlldS5hZdpZerRChD4nbWdKYp15GEj5xtjAfmhXXrvQAXksEE/lTzw+/OtCifQCJq VjwEXFG5+/+JTSzPJwSQUdrO/fpDjxRKMbhlwm4QZ9AsX2lmo/iiuOIXMz8MPmZIENxw 9HzGnk1vBrGSeWpCRiYgQ+ddjMdHJ5JuWUTNuSIRE0l2WbJHO1Ow3A124BQNFtBrt5W4 KUXkPA8fKdWWPoFE4Dnk1JaSZK7IjeHzICxzgdrE8WYhMcDW2gzC1WgHA+HhyQUb776I LZXw== 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=VBT+hkINubzn7ViFqxIo6R9gSORoTGH+ce7ZiG8bKuQ=; fh=pK0BUCpIRB+g7qDq6IYQxG+K/Pw5VzlBrowbHvk8qV4=; b=OH3i0us1mRcn6VfD+IYmKljhCP12pM4vRZAvsFhJW01A9kftKrAk/J4wuQVRouvukn kWu5QwMEJ8k3lrv0WpiGUpo62enlKttKNAfOSRl4xvktNmDcbBfAsoN635qup4YA+cHF YITem263CYdQhmPzXdD2BFNFWJ7AcZG4s/+oB+e4zCHULeNInDggMvIouQV4T37BXqVb Vw39rHoUzLA2N3IpFzCj2aWwAW6O+/YtkL/wtEIjHWN2vqZLUSSASfRSVu8M64g6lk3z pdgAnw84rPz9/qvD1oLHlJIfD7XahKgDtWu92CnH9RwzxabrPQts6B+qbTWnEk/jrIN6 FfnA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=RtevIlJx; 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=canb.auug.org.au Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id x19-20020aa7d393000000b0051a5ea200c9si3104880edq.343.2023.06.26.17.49.44; Mon, 26 Jun 2023 17:50:08 -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=@canb.auug.org.au header.s=201702 header.b=RtevIlJx; 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=canb.auug.org.au Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229880AbjF0AjK (ORCPT + 99 others); Mon, 26 Jun 2023 20:39:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49974 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229841AbjF0AjI (ORCPT ); Mon, 26 Jun 2023 20:39:08 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA89C171A; Mon, 26 Jun 2023 17:39:06 -0700 (PDT) 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 4Qqm6s6Rxsz4wqW; Tue, 27 Jun 2023 10:39:01 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1687826342; bh=VBT+hkINubzn7ViFqxIo6R9gSORoTGH+ce7ZiG8bKuQ=; h=Date:From:To:Cc:Subject:From; b=RtevIlJxP+0j//DHKYgpQ3xpWkHD2EW2KTUSSFmgp0/2cPdasfm0t2t75O2tH9FGT sAbw+G6J9McV/wQe0987xdbhumcYnIrFVFQBTeAK6p4L7oLP8VNgadxcp2Hu8eRgh9 k865VQokUQ2qeAPyYmODxlQ7GEj08F4/6GLutn0IKAIuiw0c30S1nBe8yNRcoS6Ylc L/lJw0nC0xY7LpwK+nMahTOpnM2MiXHZKabEb9StG9kbAQ5goA6YAtDU1ck/EtlkpF IiOubNLFSIVILoF1s/ziHKqpkVwiFLeHh1pJ/84Dk2VRwkjgZC3qruQyA4C0I1aiT8 H5O0+4T65ld7w== Date: Tue, 27 Jun 2023 10:39:00 +1000 From: Stephen Rothwell To: Theodore Ts'o Cc: Chao Yu , Christoph Hellwig , Jens Axboe , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the ext4 tree with Linus' tree Message-ID: <20230627103900.04fa564f@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,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: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769814893448882851?= X-GMAIL-MSGID: =?utf-8?q?1769814893448882851?= Hi all, Today's linux-next merge of the ext4 tree got a conflict in: fs/ext4/ioctl.c between commit: 97524b454bc5 ("ext4: split ext4_shutdown") from Linus' tree and commit: c4d13222afd8 ("ext4: fix to check return value of freeze_bdev() in ext4_shutdown()") 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. diff --cc fs/ext4/ioctl.c index 961284cc9b65,55be1b8a6360..000000000000 --- a/fs/ext4/ioctl.c