From patchwork Sun Dec 3 23:35:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 173028 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp2456236vqy; Sun, 3 Dec 2023 15:35:28 -0800 (PST) X-Google-Smtp-Source: AGHT+IH4dtJFLSDDN7KBBifLknL7Oiri9nXXy54rp9CU1EW2tBDj/8fBimRhWfnLMsu/7eNrbk4J X-Received: by 2002:a05:6870:c085:b0:1fb:2c68:6c0a with SMTP id c5-20020a056870c08500b001fb2c686c0amr1812904oad.53.1701646528119; Sun, 03 Dec 2023 15:35:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701646528; cv=none; d=google.com; s=arc-20160816; b=YcxfCc8C+2uFkPGiEnQZ1Hi6dFTR7mmXnx+uXWWJYz5yYNvA/0Yt9Z/B+3NhelXtNS YeZolsWk4jZhQaK2pLCRNs4ziDQ9LTdI9wrAY15yTgoFl+y2ZZhHV+8rzw/7gG6mI+qg F7pmsVf/xacCWOZ9iADMkDycy9ygLEUkYhn6ixFAa/p3HKAZ0CvPmBELCnS1JPaMt3FB vGtLE0khul4YIraHZwHeDztAzunr411bxFfFK9q2SUSrbQRILpoRLojsJAM//jz4n0/J D6c1sA6G9SF9Hp+6QD6WARUUofi6Sb2MHGNFC5ivZuNOmLU6jDN7ABKkR1DxH/urK6ah +xDQ== 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=4SeuYyjE6NX5ofJ9uaA1W0ZgO2sJUY+tLHUi7w+Ap5c=; fh=N5AEUB6l3BLPDlF3B6d0Dxd+OVHxgT0/H5aU/6bUb+g=; b=RWLWYcI1i2DEYol1csiBHe26/NlJlZnMAhSh8IYGBJyU3LQ332akvGj/QQQaMJ3axv 3t7bOdXepyUXG9pCIQyrSw6LoOa5tbzLEns60X5UveUZ0tqQUWQgpjCCsGfMuyWqY7tX /PYa51XsHWRke0p1HBZvXK2V+01ZdEnRXGlY029wOnO1rkuzCVfGfnqsRAKWUwzxjEYT 84roeeN4mrsWejbhsCbyAmJ/DvePXrQTXiMnt+pfqUTpkSAM/CR/0qNF8/NrJ517Q+/3 8+0whCoR4CxKXTRVwilEzxtCHK7HrBddQLHagGxykejIEV3QSaRnv1ZGzTxH0KUn+Qbc KxOw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IrDTteuU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 morse.vger.email (morse.vger.email. [2620:137:e000::3:1]) by mx.google.com with ESMTPS id j34-20020a63fc22000000b005af21fd2c6fsi6840566pgi.898.2023.12.03.15.35.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 03 Dec 2023 15:35:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IrDTteuU; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 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 (depot.vger.email [IPv6:2620:137:e000::3:0]) by morse.vger.email (Postfix) with ESMTP id 021258079ACA; Sun, 3 Dec 2023 15:35:18 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at morse.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229868AbjLCXfK (ORCPT + 99 others); Sun, 3 Dec 2023 18:35:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbjLCXfJ (ORCPT ); Sun, 3 Dec 2023 18:35:09 -0500 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E058D7; Sun, 3 Dec 2023 15:35:15 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1701646514; bh=4SeuYyjE6NX5ofJ9uaA1W0ZgO2sJUY+tLHUi7w+Ap5c=; h=Date:From:To:Cc:Subject:From; b=IrDTteuUcrRsDwpYS7m9X6E0gy4gLyJ1QefQD54VPqI4TlhtstRBi/MagkhYWjiUA HiR90IP0SZhNuOXscpwB2CqKOkEk/f6ctdrtOY5e9W7cVKiU/Pm5z8Vt4BOlDq5VFH z/5bFeTx6Ie4SaHAbNxSTbqIHplNp7Acppxn2XxX1iYPRqmWghA36X8Eh4ol76e+4m CrqwGsee+SmG7Rylz3VuS4EOh8S2Vy+F0X7WbRIkwi0xF3a1ussrknXuhwxQLefAzn R8TRW5f4MCzt27Wrtd4Nop83aWdHi8cjqazsy26vU96h5kFTnUFAJjo2iugkJAidJJ 5QMhO9v0EJ9NA== 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 4Sk37M2YYyz4xKZ; Mon, 4 Dec 2023 10:35:11 +1100 (AEDT) Date: Mon, 4 Dec 2023 10:35:10 +1100 From: Stephen Rothwell To: Christian Brauner Cc: Christoph Hellwig , Jan Kara , Jens Axboe , Linux Kernel Mailing List , Linux Next Mailing List , Yu Kuai Subject: linux-next: manual merge of the vfs-brauner tree with Linus' tree Message-ID: <20231204103510.0eb5ea5f@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on morse.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (morse.vger.email [0.0.0.0]); Sun, 03 Dec 2023 15:35:19 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784305710063705903 X-GMAIL-MSGID: 1784305710063705903 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: include/linux/blk_types.h between commit: 67d995e06953 ("block: warn once for each partition in bio_check_ro()") from Linus' tree and commit: ed5cc702d311 ("block: Add config option to not allow writing to mounted devices") from the vfs-brauner 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/blk_types.h index b29ebd53417d,52e264d5a830..000000000000 --- a/include/linux/blk_types.h