From patchwork Tue Sep 26 00:24:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 144676 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:cae8:0:b0:403:3b70:6f57 with SMTP id r8csp1607871vqu; Mon, 25 Sep 2023 18:41:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHB1SgzfIftwtHXQ7ZoPtKNE9HxrNJFjmcczaAh2m+C62qdtr5nXzXFcU2TrMstrXS64UcK X-Received: by 2002:a17:903:110c:b0:1c3:2ee6:3811 with SMTP id n12-20020a170903110c00b001c32ee63811mr10579265plh.8.1695692482621; Mon, 25 Sep 2023 18:41:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695692482; cv=none; d=google.com; s=arc-20160816; b=oedz0ZLNGljWhHmYV3Of3ZqhUm7OJnugp1niRQVqOPXyKkcpVviIhtEra4fhNirhgz sjr9z/LWp+83H8jNE/0t/uGLekdxn28zq2rID9X77JnACSrxzBqDZavvEqGXVRbR74if qymfTW22ZCxtF9pcErZ0EeO2krj964soAlPzM9d2BOf5x+ay+/tq3wGSes5273MB/wYv LICiJt44UrWs5mjXyQfW7cEBvl+1GvPpnGkao/Jk3x45H5755b6HBwEyNpN3vWk+To3P hwwh1djAZPIF4PI0yM9bpPXzR6nlOCNChO7gK/XdUTw/EqgLOciczLVhyuR4MM4vehlz wgDg== 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=pSvZ/NDtT7o0Drx+hp/96icidCkoEPNzZVGN6gpyl14=; fh=ofltMOUEGRVwc6kaPAzaODednTpCiYAc29aQXB+3ze4=; b=BJGWAK4cP6wq/rUN1T0SjZxhiqLRLyvgkmStoNs2627bQo/NT/vZVSLARbEgxJEh5l pvNJxrDacRyvmuvK/N2rFD0tz/0D2yH77dXWUO2DX4Xi0NI05zCDcZAW0ubUpxE5t++w FUaIb+sUiHgvRXEcvAw1tvvxGQ7s1yzGHKDUdavpe0lfsRJHxzZq2xQNLl35aV+FL5Ym 5J7rTw2Gsj1Fews5Udjafx0oODWIpT14PJqfiVKmlcKraSIGPBTmYjr1vYQqNaUd/72g Z4ssQhd/TKPUuXHitqbf+PViDjEz+1a+fisyQph6E2bAML5QKJnYroM2G6IBwrLV3DLc UgLA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rVFAUQZa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id x1-20020a170902a38100b001bf20c80685si10710336pla.125.2023.09.25.18.41.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Sep 2023 18:41:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=rVFAUQZa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 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 agentk.vger.email (Postfix) with ESMTP id C0A59819D1E6; Mon, 25 Sep 2023 17:25:16 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229842AbjIZAZA (ORCPT + 28 others); Mon, 25 Sep 2023 20:25:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55832 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229460AbjIZAY7 (ORCPT ); Mon, 25 Sep 2023 20:24:59 -0400 Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E9C4F109; Mon, 25 Sep 2023 17:24:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1695687887; bh=pSvZ/NDtT7o0Drx+hp/96icidCkoEPNzZVGN6gpyl14=; h=Date:From:To:Cc:Subject:From; b=rVFAUQZaTXU9BP04EctQ7WkQYV2DI3s/1T/no+YB4AgJDGu5ORgCV0Fa4PTNqJW0U xw3L8dLY48y75ejKNrtsO2aSBqK3yJo0PHKNty/tZ1+n3CTZ9Wzil1aqM5HsE9CSk3 vK+Yk4yb2VXAoj85yB8CzntufW6qgwjMoZZx8pOlmGGypgbKj7780M9SaVfesxlH6/ Wd7PoGramFsg/0GGBEq09gNwVZKc128VHGrehcuKF/7fWeDsTEkfL86065visMct6O 55hyL8faueGT+FeLUjlsmeA7OwKsAx2hEyUzWhoyD3XnBY7wWZh1VS4b2cawe6WEeL 3ENvnI0nJr2gg== 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 (prime256v1) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4RvgVQ0M2Bz4xM0; Tue, 26 Sep 2023 10:24:46 +1000 (AEST) Date: Tue, 26 Sep 2023 10:24:44 +1000 From: Stephen Rothwell To: Christian Brauner Cc: Alessio Balsini , Amir Goldstein , Jens Axboe , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: manual merge of the vfs-brauner tree with the overlayfs tree Message-ID: <20230926102444.096ce797@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 autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 25 Sep 2023 17:25:16 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778062440724100174 X-GMAIL-MSGID: 1778062440724100174 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/overlayfs/file.c between commit: f8f29a49ec21 ("ovl: move ovl_file_accessed() to aio completion") e57757c5d874 ("ovl: use simpler function to convert iocb to rw flags") from the overlayfs tree and commit: 2d1b3bbc3dd5 ("ovl: disable IOCB_DIO_CALLER_COMP") 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 fs/overlayfs/file.c index 05ec614f7054,693971d20280..000000000000 --- a/fs/overlayfs/file.c