From patchwork Mon Oct 9 23:50:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 150421 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a888:0:b0:403:3b70:6f57 with SMTP id x8csp2183161vqo; Mon, 9 Oct 2023 16:51:02 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEPfUDVw0nJS13bLWrAjpwrJ2GWBN3Bgw2ZvmF68UDz4pVIuhg9nzyOajBTExDuN+MbcjS7 X-Received: by 2002:a05:6a00:b8f:b0:693:4202:b535 with SMTP id g15-20020a056a000b8f00b006934202b535mr18238164pfj.27.1696895461919; Mon, 09 Oct 2023 16:51:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696895461; cv=none; d=google.com; s=arc-20160816; b=P/qBGrF6hySDw2RH9AxSqz7h1v6Haaky1IJIMEUEmL/T4M0xUCDIoISTQVEWyGRq4Z ApS1SfWDrykbwMYsTmNrOfkZ1b2czc5ToEsVVEKrXCcMOMUaVM0DBHxcnEfqjzOzw491 iYijYlnGaDRYt2HE83TMCUFC9Nuw/A0NRkQMHZ3BKRdvdweXclwMtwLxw3zZ8BKWutvT 8Za83+CHC+J52BtjZLMhxmNu1Cp9obqZZ4WTBRRlIJmB7eZfdRgcLmgzYe9UUz25vuiS 0S1gcMWLMFEvvmFPze9ch8QmUycNd3cQaXUhoNTafzpCXFA2X7t5eLMpQzra9JMZJ59I rLzg== 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=dnZV4RzzP9FMaCBlEyghmh9sjDpcoyZ4mg0YcWIuolc=; fh=WtBpZortvRv5gtz04LY8YJsIPlPd731/0kGmD2q6kRI=; b=IGFf4sr6lKDFs8mkUmX1Tb7RTorLkTOJrbPcUTUihQ1DLKZZWDZadaLvoGFvuOkGwb 4y/GM076JkHQ+MvMekZKw+pP6rAL/6acXEALL4d3bs0IpeoCRU6okgpYIWZVDRTgF6yS Os8gNZ+o6GHyzhKtKeziW00waYqAorKzsb6sGv5bDovHNYM6HmQTXQrkI+flvhK8/ZEv wdkuMZvbGfo1hMV5I+q7evDl/jFlnrVvVD0MEH3IsEF3be9EpB0GEhjlWE+7E6cpsnVi 1LnRrTD3YeMtZDFI7hVR1SroCZU7el5Rauod4VlZ7zLT0Tk+jsmhWpyesYbSvEC91Jsf ha3w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=tSkHXXoM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (groat.vger.email. [23.128.96.35]) by mx.google.com with ESMTPS id o24-20020a639218000000b005898c065015si8493183pgd.228.2023.10.09.16.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Oct 2023 16:51:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=tSkHXXoM; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 groat.vger.email (Postfix) with ESMTP id 85AB180BD5F7; Mon, 9 Oct 2023 16:50:46 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1378992AbjJIXua (ORCPT + 18 others); Mon, 9 Oct 2023 19:50:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55270 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1379099AbjJIXu2 (ORCPT ); Mon, 9 Oct 2023 19:50:28 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C5269D; Mon, 9 Oct 2023 16:50:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1696895425; bh=dnZV4RzzP9FMaCBlEyghmh9sjDpcoyZ4mg0YcWIuolc=; h=Date:From:To:Cc:Subject:From; b=tSkHXXoM9Sjk+lz7z09c2ciLGLCcVnS/Z6WPaGHThiUe99eaxykYGk3XiyPfs23dU 4ApY/LNgrBKn0HIgDiFP+CcOvsmFPDT4hpXMEh1xEcFwI68lq6KC+akAGXbPyJYMi9 273bcE5qhTN6LW9fOoyyzUOZ9SgH79Q1RrCeYLfS+ehynpJa2dzO/6Icyd3MxWUxSq T9iz4cGpMIkuPDEZH3S2c5jaRYoJDBE+md2cN20DXgLSRUqrDwbDNrEjng4ffKdHWO nZz2wb3tzTuH9005LjNVtBeZfrVmPB2gVtQJ/L7IHmGsIhF7piRsY7OzxzMTRi4JDK 9iy15hN9Eig/Q== 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 4S4G4G6MkRz4x1p; Tue, 10 Oct 2023 10:50:22 +1100 (AEDT) Date: Tue, 10 Oct 2023 10:50:21 +1100 From: Stephen Rothwell To: Christian Brauner , Miklos Szeredi , Amir Goldstein Cc: Alexander Larsson , Linux Kernel Mailing List , Linux Next Mailing List , Wedson Almeida Filho Subject: linux-next: manual merge of the vfs-brauner tree with the overlayfs tree Message-ID: <20231010105021.57fa4379@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=2.7 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, RCVD_IN_SBL_CSS,SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on groat.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 (groat.vger.email [0.0.0.0]); Mon, 09 Oct 2023 16:50:46 -0700 (PDT) X-Spam-Level: ** X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1779323856207066092 X-GMAIL-MSGID: 1779323856207066092 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/overlayfs/super.c between commit: 1e97d6e67406 ("ovl: Move xattr support to new xattrs.c file") from the overlayfs tree and commit: 3f644c1cd7b5 ("overlayfs: move xattr tables to .rodata") from the vfs-brauner tree. I fixed it up (I used the former version of this file and applied the following merge fix patch) 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. From: Stephen Rothwell Date: Tue, 10 Oct 2023 10:47:16 +1100 Subject: [PATCH] fix up for "ovl: Move xattr support to new xattrs.c file" Signed-off-by: Stephen Rothwell Signed-off-by: Stephen Rothwell --- fs/overlayfs/xattrs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/overlayfs/xattrs.c b/fs/overlayfs/xattrs.c index 1b16b0abdf91..8a9c76adbf5c 100644 --- a/fs/overlayfs/xattrs.c +++ b/fs/overlayfs/xattrs.c @@ -251,13 +251,13 @@ static const struct xattr_handler ovl_other_xattr_handler = { .set = ovl_other_xattr_set, }; -static const struct xattr_handler *ovl_trusted_xattr_handlers[] = { +static const struct xattr_handler * const ovl_trusted_xattr_handlers[] = { &ovl_own_trusted_xattr_handler, &ovl_other_xattr_handler, NULL }; -static const struct xattr_handler *ovl_user_xattr_handlers[] = { +static const struct xattr_handler * const ovl_user_xattr_handlers[] = { &ovl_own_user_xattr_handler, &ovl_other_xattr_handler, NULL