From patchwork Sun Nov 5 22:24:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 161790 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:8f47:0:b0:403:3b70:6f57 with SMTP id j7csp2327630vqu; Sun, 5 Nov 2023 14:24:23 -0800 (PST) X-Google-Smtp-Source: AGHT+IH3w1tUjpWS4posq1Irnrem+vD2T35nhRGFGvRGHFpJEB6diyovyCADiEE85kdcyCOBHfzB X-Received: by 2002:a05:6358:3399:b0:16b:66d3:70af with SMTP id i25-20020a056358339900b0016b66d370afmr2316990rwd.7.1699223063336; Sun, 05 Nov 2023 14:24:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699223063; cv=none; d=google.com; s=arc-20160816; b=1DXB24tvrVZLFdwCfLG3njIw+dd1TJGaVbqr/+spzqmMs2E0VQbexWOGQX7Ssz3BI8 V3V57FyRYObGHritX+ZQq1nkopW7AQ7YlknIsq1JBKdGEyXUnhd3RabpLGjcR4tCja0v Dw9yuVJED2Ai4Obfv0mcaC1KKjbxnZtWwppUCZd0v0GeiC5OW4TYOzLWKwFTRGvcTIc1 S+GkLsieQWTmEwEgvSoDp0wQ+6bMFeI9RALcCruBeZxyyy/NRKBEFrOZjFv3OE1Bl8dU v/U95+Wlbyfa622PEd2lIuYVW87b6xJm/qtMl7AwuenC7g5lKxDFN3SRhkMXJ0enKN64 a36Q== 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=YAxELxRWIwi3c78SCzfri2Ak5wWEvow0ypGfivoE5p8=; fh=NA0OsT0IN2UlFuFYI4xzNKMWJRf31Gi+eGPHIi28a3k=; b=p7RqYaCJCywsYGkjD+up3BL5er/T5fr5nNrSo8c9JuLFuNjQtsiVAPHEMqkVtVo8L+ OsFw0qBxbPJ0MniHSzbz/uTZOQTr9h/Au4AwRGLowgATauFzNVOTE8kXay+kOTAjYSWk 9DrHkgczeom3TWHj/rrDGnO8CX8OOHkS8lZSPodR6r3M7YaeOfbzD+/1jAy2jouhjr84 I779FKDwyxjl1iO8Q7afb4B07QHJDf86MND2s8R2IlOo7bYBTUE8wtP8ZjxrilGAGLk2 cIPlXGjPGxoQO7EeYNHLyISw40L640aKupun3E1uMHNuIxuNFxFmR9cP9hBJnrMlqIf0 LuBA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=a5pAmDZK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (snail.vger.email. [23.128.96.37]) by mx.google.com with ESMTPS id y10-20020a17090a86ca00b00280281c4acesi6872662pjv.45.2023.11.05.14.24.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 05 Nov 2023 14:24:23 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=a5pAmDZK; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 snail.vger.email (Postfix) with ESMTP id 6946480C245C; Sun, 5 Nov 2023 14:24:22 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229777AbjKEWYU (ORCPT + 34 others); Sun, 5 Nov 2023 17:24:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40570 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229447AbjKEWYT (ORCPT ); Sun, 5 Nov 2023 17:24:19 -0500 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF2FECF; Sun, 5 Nov 2023 14:24:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1699223050; bh=YAxELxRWIwi3c78SCzfri2Ak5wWEvow0ypGfivoE5p8=; h=Date:From:To:Cc:Subject:From; b=a5pAmDZKcdrZF5107HD+V6yB4Fhj4EXTK/W1vMZ/zwQUh8YD8KKxBzcR/7fphNNdE fsIhYJzGJwqRe8UHYryftK4i5KrfGNdHbGRo6rYoSXQ+oMf2Vcqv2xIm+uQviiaPdE EKw0rCmsS73R2OPEaKTotWv/RkGMRrjHDxHJJ1j0OkzcXtemh+8h5HHJUUtsl18yPF UIG/0bg0t8vUJwArFNYztuFCZvhcWgW+Q/CZdjPw+P9jDyK9nFZHVSmY0s+jUqA6Aa 9X6G7/uYGu0EL/dZBT5QtBMlgTDQseJWwloaTbYJfVGMqdn8iDee/Vypgn+9PWmtWR +UjDLKRTCnTFw== 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 4SNptL40vRz4x1v; Mon, 6 Nov 2023 09:24:10 +1100 (AEDT) Date: Mon, 6 Nov 2023 09:24:08 +1100 From: Stephen Rothwell To: Jeff Layton , Ilya Dryomov Cc: Christian Brauner , Linux Kernel Mailing List , Linux Next Mailing List , Xiubo Li Subject: linux-next: manual merge of the ceph tree with Linus' tree Message-ID: <20231106092408.24ea682e@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,RCVD_IN_DNSWL_BLOCKED,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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Sun, 05 Nov 2023 14:24:22 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781764523043385699 X-GMAIL-MSGID: 1781764523043385699 Hi all, Today's linux-next merge of the ceph tree got a conflict in: fs/ceph/inode.c between commit: c453bdb53534 ("ceph: convert to new timestamp accessors") from Linus' tree and commit: 38d46409c463 ("ceph: print cluster fsid and client global_id in all debug logs") from the ceph 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/ceph/inode.c index 2e2a303b9e64,b1b92a948a3b..000000000000 --- a/fs/ceph/inode.c