From patchwork Tue Oct 31 00:24:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 159896 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:d641:0:b0:403:3b70:6f57 with SMTP id cy1csp2592072vqb; Mon, 30 Oct 2023 17:24:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHhs2GwHnCJ4B/XosRvw1d6Y5ACe35qoErZC3fMP1r2uckvhUSvl0er0+izKFrJ8u2jnEkl X-Received: by 2002:a05:6870:2007:b0:1dc:c65e:ded2 with SMTP id o7-20020a056870200700b001dcc65eded2mr14624604oab.12.1698711898007; Mon, 30 Oct 2023 17:24:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698711897; cv=none; d=google.com; s=arc-20160816; b=GJbqiID4T6JBewdTjA7nj80rYbyOH0iq+Ay7y/FyqnRAaY0a6HsWSuB19+TvSOOtbb FZWRDD44/fOfvFCvlDLYg73kIMIWfCn2WU6R5+/icspBoluldCKsyqHhwbPhIvZIrILT EcznoJnk224qUK2aI/hgUDrmkbVa9zg8xX7xWloSayD1rg7x65fJDPFzUuZ6wMjpQlDP ROimeZ+vzwVHxEM4VkEiIXZr/K4C6ZabWwbADjs2tzsTcmVKzbxEsD8S9pOvSGnw2zpS a0LokhG+4D/bDh98/CpEpIGtr1OXs+JO7nydCV4LD9v27H4eeT1A8KjwIuZb/XFjpFM/ zFzw== 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=TeSlqjbE4T8/9w6BkWEqBi/or+R2Kb6ZESw56Zd+cJs=; fh=o1SrXnDALtx7vZ5+D9p2fbL5ZYyaj/Ma9nrYymzhezY=; b=Vv2wytfuQq2Jn5CBSXP50l2DCP1Jn2rZQ6pUCahh+qVEpMpUASUD5vlREyhkLEp9Sf Idudpwp5MTgiOOAZy8Pe045/FcUAXtBF05YYXNFJxWbhsnPYrR6VJSkSa9mF8qTnniqq VRj41acKe6Z4glPN+gWd78PZrUCd6WYv/kw4lJjaACo3tOvaSvTQ9AT7U7yw2Kxu0i47 mMT/HkouzimTcbgyfHhENgkiHFdHKoVCBkenmpWqgIFWQWrYbVHY8BYetIp6SdyibRYc 9ZW1A4EqxLXRafFwKlCuGZzA3KCJIDRM1wMOxGQudSv3DeZnoBC+9dNfdXoV7kIpCoGx /ifg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IT70Y4Cg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (howler.vger.email. [23.128.96.34]) by mx.google.com with ESMTPS id l128-20020a633e86000000b00578cc8d2599si195707pga.211.2023.10.30.17.24.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 30 Oct 2023 17:24:57 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=IT70Y4Cg; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 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 howler.vger.email (Postfix) with ESMTP id 36A5C803E59A; Mon, 30 Oct 2023 17:24:55 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at howler.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S236729AbjJaAYp (ORCPT + 33 others); Mon, 30 Oct 2023 20:24:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38050 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235371AbjJaAYo (ORCPT ); Mon, 30 Oct 2023 20:24:44 -0400 Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EF0AA9; Mon, 30 Oct 2023 17:24:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1698711880; bh=TeSlqjbE4T8/9w6BkWEqBi/or+R2Kb6ZESw56Zd+cJs=; h=Date:From:To:Cc:Subject:From; b=IT70Y4Cg+4n51qyl/qrwuCQ16hQPZPn5zQFYSlNUlZuBfwRPbeiGs7H1iDiGm57fu sjLqn6P/Cqvzk5dTlwv+MTkKuncylXPIIZL150jI95C28pZ7Mlmxk8FlhpR8NxTL8A cNFll7QbUYTagSgaJeOSJKqY4ofGZuz50Xy82BTb0Bw7tlKLDNNtDbEA3x/LZOGgvO pazuwfo9/r/DikXfZBKvaPYnzpbmwxBj6RNNInDUKh/RM49bxhVSrfLyMMfn+Dz3eY XIyrqPsH3hq/GvZ4OEbsookKzi5UTTeq8ryMIPKBxpP8kOWpjnjZ03k2GQ2dgZgt9C GExsoP5mBqEPA== 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 4SK9r84Qyjz4wdD; Tue, 31 Oct 2023 11:24:40 +1100 (AEDT) Date: Tue, 31 Oct 2023 11:24:39 +1100 From: Stephen Rothwell To: Namjae Jeon Cc: Christian Brauner , Jan Cincera , Jeff Layton , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the exfat tree with Linus' tree Message-ID: <20231031112439.00d4eeab@canb.auug.org.au> MIME-Version: 1.0 X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on howler.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 (howler.vger.email [0.0.0.0]); Mon, 30 Oct 2023 17:24:55 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781228526772511548 X-GMAIL-MSGID: 1781228526772511548 Hi all, Today's linux-next merge of the exfat tree got conflicts in: fs/exfat/inode.c fs/exfat/super.c between commit: 4c72a36edd54 ("exfat: convert to new timestamp accessors") from Linus' tree and commit: d76271feecc1 ("exfat: add ioctls for accessing attributes") from the exfat 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/exfat/inode.c index a2185e6f0548,edcd8a5c38d1..000000000000 --- a/fs/exfat/inode.c diff --cc fs/exfat/super.c index e919a68bf4a1,e7cba540c99e..000000000000 --- a/fs/exfat/super.c