From patchwork Sun Feb 25 23:55:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 206148 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp1787122dyb; Sun, 25 Feb 2024 15:56:09 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCUnmsxDmE2eplSSrz6WzXz0bG2AHM5R597tvSKdnXXRu60AVPsVV4AnQvC4EdEVL9pRRbPIZDj/QWzFnm7g7S18EEizjg== X-Google-Smtp-Source: AGHT+IEfsDhxaMf75rGMm0TQ4KJ7LcrdOsG0/KnSoJhFVGjyqqa4xF7atFRX50lGYr1CeY7nwAxB X-Received: by 2002:a05:6a21:6802:b0:19e:c9e8:f2bc with SMTP id wr2-20020a056a21680200b0019ec9e8f2bcmr7346639pzb.15.1708905369717; Sun, 25 Feb 2024 15:56:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708905369; cv=pass; d=google.com; s=arc-20160816; b=SFb7iD4RcTktf2brYj12U777z7YJdGQNbq045efbKRte27QOx1zkvblFScIflQNf88 KIVzeqCE7c48Mxxtlpgeay7vdB7EjE2WLwHIcmPh/SRF3YMy8vcHlyL7ol5gKEI7oXcl pJdHJ4hVNI03vK5W010X8VG1EWHEV1DXU1PYQb5GiWzcSoeWjYDaQk/gPGQf3HrKdQjl DNk+aZwCc7OTTdL7DRupIvoSA0cX648nNGMmsbrLJJcowRcqpYGvLPUgtMfoNsKFNTJ2 FQM0mVESn6YOO8sChx54LMwuLVNSCt7T6/KCnFsabjALsIuva/4ss8k5vUdk6M5sb7jn dMnw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :message-id:subject:cc:to:from:date:dkim-signature; bh=0VdcT850UcoWWgcZajJ8/+4AfrFw2v/5C9GyePsHD9Y=; fh=XJQCZnc8+0IoHR0GsZ6A9hPImdnlqfQdV5hHCx45ySc=; b=eQZ/9ktNL44DYEyGk7S1hLacFPK8x5Y7y5ii/30suAMP+a2+6Q99fw8ViSyovOxryK 6h3sO08E95VZjHUZ/djtEXme/e+UccJ70yG0vywgoMD84h8Bg3qxuNf10Ijc5wZqsxAK Led67HWtov3PBIE8bChIfWkADnAjdX486MJHCx3PMEvKtESLguZyLrmRbsDAXPbfDvtN QNz1VsUMFyd0kLnx1bLdOj9y5ggT1T9KaFOEohu0LoXXtrNeOe1zG46T7Ob0lxmnpEiQ 7evnnYuArzfGi3WuSVfwefHCy70fOgq/W+q9uW6Z+kULp4Twpw21J0SnTJRgT2QYhYn0 oeUQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DILHocHD; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-80348-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80348-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id g1-20020a635641000000b005d8e3645dcesi2682404pgm.210.2024.02.25.15.56.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 25 Feb 2024 15:56:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-80348-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=DILHocHD; arc=pass (i=1 spf=pass spfdomain=canb.auug.org.au dkim=pass dkdomain=canb.auug.org.au dmarc=pass fromdomain=canb.auug.org.au); spf=pass (google.com: domain of linux-kernel+bounces-80348-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-80348-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 854572818E2 for ; Sun, 25 Feb 2024 23:56:09 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 938C11BF27; Sun, 25 Feb 2024 23:55:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="DILHocHD" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7C8663CF; Sun, 25 Feb 2024 23:55:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=150.107.74.76 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708905353; cv=none; b=PEE3FazbGDyE+cJYI79i33L7nec1nYONnMmxtpHjZ/V9YMIpFnVKEmTokiySGs38wXWuKZf7M04YsFwAceQpEoWWYmPdoXW0B3AwjwHlz8p5pZbuYF65BWPcE1/5T+dWDKV8iZp5VhKowhKhsLdIDCGzflMui7CAHk7U5ou1BJE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708905353; c=relaxed/simple; bh=+ljHicFpx+gyo+qYhC/fcOr83KNDy5gQPApmdeXUvLw=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=X6ocepP4qRa7w7svlP6T8heS9Rr4TkkawWlmETYSxQgxO8suziD5bPbn3RDsJ1sBJwO4jE+YCckMBxV1PzTSkJU5IAeSzPj8Ju81YXqkRWNWCHr2e2tXKzupoF9SNqrqtteXsuwJ3I5dZULvmDdfSL4ywZnY0BR9YkNUomCkxtI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au; spf=pass smtp.mailfrom=canb.auug.org.au; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b=DILHocHD; arc=none smtp.client-ip=150.107.74.76 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=canb.auug.org.au Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=canb.auug.org.au DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1708905342; bh=0VdcT850UcoWWgcZajJ8/+4AfrFw2v/5C9GyePsHD9Y=; h=Date:From:To:Cc:Subject:From; b=DILHocHDeyY4POhfOZ6IreqqBcRq43xJZEsULM4MW0LX7qm2/WgPU76tINa5rKEjY hBePYVIjMDyrig7w2xDirGWx9U4HTBYdppAoBApEYfcnagcPkPqGT+jhFh1CffNDV5 f/wtKZBEGZq4cYCQWLPd3wvnwUsEVWraM/YOcQqbUz6WYUQ1zxodsdWpJFeSLb6Y6N +P38BdTChwEQiw/OuN0fNGSOdBsJabepKEYlHXqS8TXM12hsjMpgP5SSnW9cv/ekGV wMOJWlDDy2s5yQRRdvzhZjnYLy2erhOikcoNgsh7a27+L3gBGCVH84FSJLDPxAJKiY rbniKRsLfPGag== 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 4TjgcF2P6cz4wcY; Mon, 26 Feb 2024 10:55:39 +1100 (AEDT) Date: Mon, 26 Feb 2024 10:55:35 +1100 From: Stephen Rothwell To: Miklos Szeredi Cc: Al Viro , Alessio Balsini , Amir Goldstein , Linux Kernel Mailing List , Linux Next Mailing List , Miklos Szeredi Subject: linux-next: manual merge of the fuse tree with Linus' tree Message-ID: <20240226105535.2939b066@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791917156939813112 X-GMAIL-MSGID: 1791917156939813112 Hi all, Today's linux-next merge of the fuse tree got a conflict in: fs/fuse/inode.c between commit: 053fc4f755ad ("fuse: fix UAF in rcu pathwalks") from Linus' tree and commit: 9fc953f59383 ("fuse: implement ioctls to manage backing files") from the fuse 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/fuse/inode.c index 516ea2979a90,c26a84439934..000000000000 --- a/fs/fuse/inode.c