Received: by 2002:ab2:788f:0:b0:1ee:8f2e:70ae with SMTP id b15csp223032lqi; Wed, 6 Mar 2024 15:24:10 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXLNhYdUPg80tqN0/ojc/WMszNsVcsrJgtqnjELvvsKNlcbXpYGiV3BISig5WnOgtM3BhlqGyjYaRPW99ydZjMC2aGoTa+mTxZvPRHIaA== X-Google-Smtp-Source: AGHT+IEEKEEWx1uPhSvKXgDcUtwWpP9lV+ZUEGL1a4wdStheH4JaxEn41N5EzDWATHNbwx9B5v7j X-Received: by 2002:a05:6a20:8f0c:b0:1a1:6c19:a10b with SMTP id b12-20020a056a208f0c00b001a16c19a10bmr1894878pzk.12.1709767449895; Wed, 06 Mar 2024 15:24:09 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709767449; cv=pass; d=google.com; s=arc-20160816; b=AOBOZPQhd57zCnxL66QXGSnYaeui/XK/r0Z1c2HvJIDUwFBsxvCztnaD7yW/scM6Zc UzdN4wcIdTjWH5BTmA2pVCMjUkcjzFR1bZ/cFwd2lEe8xkLB+8HMcfQUqou78hmvSDDk Cq+DY9w9alC3ERTXEvMeh9foSCoNibhxeBjvFzNdV6+yW6s8lsyUWDPnL+N11OawLsT4 mYJu/paW5Wg3/Dn+osf6oQH8fZz8w7vsDyTVWYwAFeetgnIlQGbvcR6KtAS5+uyg11ET 6YexE0YFKLTkpbkPL+1QIWbuJgtlpqpOxgLEtCYc/SHmcSZ3mrw+/TQKtdbIRFCIcQEO nhuQ== 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=FZXeQEIdwXlGJvA07K9m/Cro4xP/ThwWpwE1wnciCRk=; fh=EMWOC5XRzB+absYVqRfOvUWVlDmJbD+5lsh9F849yrk=; b=xnYEt/W2YXdae2Eys2MhZ0NEwnffnkCve1E4Nq3LCAk7kIhYDOJ8p0I3AWUhJOUlum GWVzKhvJsLPIpfQZhH3QTycRxOPTRoNNFNIdz2zLWhfpWrrvXuJNvtK7OzST7n2d6uNG wl7g7Iv9x+6HYg8PrsXUntR6qoMSzET5iokLp62PwAw5I4fpV9ikr8rrRl8aFYNI5LS5 fU0KUkqjqY9ZxpChUOwVCcEn+4CD+KREbCBzfwgZn1Oxsv3enCPKddV9zvtAc+amDiRB s9ufrDR/jayjmIcbbuLxpmBlD1I1c+e6WyKnq5K/HNM3fXYQd44skqi0wB2RK0kg2385 8xzw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=NhEPqTgf; 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-94708-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-94708-linux.lists.archive=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id na9-20020a17090b4c0900b0029af24d4239si491844pjb.179.2024.03.06.15.24.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 15:24:09 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-94708-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=NhEPqTgf; 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-94708-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-94708-linux.lists.archive=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 sy.mirrors.kernel.org (Postfix) with ESMTPS id 761EBB21F09 for ; Wed, 6 Mar 2024 23:23:54 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 049F61CA88; Wed, 6 Mar 2024 23:23:42 +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="NhEPqTgf" 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 C0C71F4E2; Wed, 6 Mar 2024 23:23:36 +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=1709767421; cv=none; b=ZsfQT11XMdpeSQTYz2G4YAN/NZ5m8RMTloGNLcY94C5LCij+wAfIbyQwpwPOe2UhF+Kx3znuWl9+zEqSBcLdtUomZ0eIr4lfpG2c8AFXAKmenKD25sdBxMNyzbiV3p+HkyKHNiNOxdRqY/XRGpa/G1W2h9LC40GFFSRJDw8eaPU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709767421; c=relaxed/simple; bh=iz0MmE5ufz7Uu0Bwr1nuZDuLAnvfNg4CBcrYSwQpOQk=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=KNt1o2pJW6gKgy8uEN2BVKAFXUGr1PF7XBkKhGJhe6Dh/5FKJs0hznbf+mzRnG5wSkwqGfJNpprq3w/Q5qYulKmyVnBkF8O4aA+ZKrrDy/0fhJLKKBYLFFgGLIBP4p3rmYVmlIrwg7dk4giSjw3JXI0QyZ2+/8PXZdrFQHLuI68= 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=NhEPqTgf; 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=1709767415; bh=FZXeQEIdwXlGJvA07K9m/Cro4xP/ThwWpwE1wnciCRk=; h=Date:From:To:Cc:Subject:From; b=NhEPqTgfJm//YA590y4qlWjv0EyMLWR7d0cqanL0R6ktRTaaWN3O/n++WduUnBMGA rf42koV3EAwHlklIbUDUv+43sKVSnl+i844d4+3+h8XhvHQimix4PeCgJj7uNubaB5 0zYFB+b3m4LA5frLnLB5UI74jzI16iv7k4Rmb9yCrrsECSWLk+i4S+rU7H30106PTL hta/MaVPI8XRK71gdv52rogTUtqZ7DH9YVPPEaoxkF7EiXgmICj0KWvsKORlsaWVgD pA/o4YwOAKUu7MYNlb02CA2N09a6Lr6IZy59bBUtYLAdZERFkLMC7ewTCx+z/3VW4Y HLkfa0QYLrAjw== 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 4TqpQZ2NC4z4wc7; Thu, 7 Mar 2024 10:23:34 +1100 (AEDT) Date: Thu, 7 Mar 2024 10:23:32 +1100 From: Stephen Rothwell To: Christian Brauner , Miklos Szeredi Cc: Jeff Layton , Jiachen Zhang , Linux Kernel Mailing List , Linux Next Mailing List , Miklos Szeredi Subject: linux-next: manual merge of the vfs-brauner tree with the fuse tree Message-ID: <20240307102332.6793fbc7@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/OjKIYfVWi9M0_=J15R_vwgl"; protocol="application/pgp-signature"; micalg=pgp-sha256 --Sig_/OjKIYfVWi9M0_=J15R_vwgl Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/fuse/file.c between commit: 8a5fb1864313 ("fuse: remove an unnecessary if statement") from the fuse tree and commit: 9a7eec48c971 ("fuse: adapt to breakup of struct file_lock") from the vfs-brauner tree. I fixed it up (the former removed a statement updated by the latter) 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. --=20 Cheers, Stephen Rothwell --Sig_/OjKIYfVWi9M0_=J15R_vwgl Content-Type: application/pgp-signature Content-Description: OpenPGP digital signature -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAmXo+vQACgkQAVBC80lX 0GxOoAgApT3//cFPYBH8ThTsUfBiE9XTLfR3uqkyr+uyt1xgD6oTk1Xcz/TqqpzA r7Jkfp+ts5o7FTQi3jVoXBxNOu/3vgMrx+NJbqSuYOgn9ZmgSiT+rnc3QV855+bX shjczBDu4a+1/3a2IQemTPnfXJDE5agNfTYIZx8WsxOQ+7Q1xtKCxVhB3G0LIAzb Ax9/imt/XBS27AgAKfdS6Z2QRKY+TG/rpxZ1Mnr/PmbjWienZWlLcLHkuoUxovo5 3bO2KtB8TJB+I//6TcambXpcHk6X6LIkq/LhxgvSgOrD6azSfELFJuaQrIP4c37y gJir/cq/chWJS/6xFM9WhBCPi8C6Dw== =clP9 -----END PGP SIGNATURE----- --Sig_/OjKIYfVWi9M0_=J15R_vwgl--