From patchwork Wed Feb 7 00:41:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 197679 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp1915190dyb; Tue, 6 Feb 2024 16:41:45 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCW1895Y56SGdJ59zjF3VAGptT7DHO1CG9yCUWPMuJiGng07SQ50ZsiR11/dS+kpJevD+utSmhV2gxckgPOWzvWRxG9d0A== X-Google-Smtp-Source: AGHT+IGdYpmU8S4Sl7SfVNcOlSeQXR9qEdjX2zX8nAA3men+SeQpP32If8hz1Xao7SJoqmcoGm8D X-Received: by 2002:a05:6512:3084:b0:511:4cc9:33a4 with SMTP id z4-20020a056512308400b005114cc933a4mr3943054lfd.52.1707266504858; Tue, 06 Feb 2024 16:41:44 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707266504; cv=pass; d=google.com; s=arc-20160816; b=rjINd5Gqpjy5PGvb1IrfbARK30yUhglsz8zmZoqphLLxBcLbHA0LBD1ew3H34WHQ/s hJgmRdq5han/Zh61jrTTgRxkCI+BVX8+WLTMHoWDywkEtJHKmQI0GNUqWABzseCzXrma bniIB8nQ68+K+zVclZ00gae2ljofNkUb0cMaV8qTS+spNR5wie6wj8mjkI35dXPOY0Js aAt80l0EoXHEE7+ztU2EWtA31J5jXpBVQCPmWjkVzK2xLU8PIIKh30vRs7Zr2cuamffL Ys5UyrmpwpBGXAL+++76NSOqy5/sBskIgwrukKWr+PveK/UPoxBcrteJ1sB6LxNVTR8D uHUg== 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=A6Qs5ml23u4lBTJh/n/0jZCbBZW7uELlezDPWWgN0J8=; fh=vDpZFJdfYA37XSM2RE3SlLifQ1Pn+6FIKGgo91nC240=; b=XvG7oNiiZdOMviWpTM92TQdHSoAwQi4Htxv20D1RE01CSHG5klzlRMQMbjxEnfzNos Ck7ZcXUklYEZ7QCJmSMjaMioxbYDJlHBzKd1C7dpgkejPk7faQ+l8gN06ase42j8tnJ5 B7cQtR5u7GEgdcmRIsRGSkQ7t1HjzaD3ZhxZwzjzVXkos7AVvcefDn3ZIJOrq5udbPn1 MQEldGSJwg55WUeSURaI+gtoKB63+MZY0WssnTwPXA8BSvViWzpNi6wpTt45YMMhzm/j D41j1ZNG2VizLQqVwX49ehKsUQW1kx/W4rj39sSEGUIVLDC65A0giceoCd7DkT++9hyv 8vjg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="E/rKhbtw"; 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-55765-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55765-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au X-Forwarded-Encrypted: i=2; AJvYcCWCevzXZk1jop0MLg7eD75mwbTO3X8tqWqj9lYepAMHXqRWUycz1B+JrxAvDEpBv56Y5q/EnIi7c8ftZf1yFD3wFRMGuA== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id t22-20020a1709060c5600b00a316f007a47si168440ejf.57.2024.02.06.16.41.44 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 Feb 2024 16:41:44 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-55765-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b="E/rKhbtw"; 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-55765-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-55765-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 am.mirrors.kernel.org (Postfix) with ESMTPS id 530A31F23D39 for ; Wed, 7 Feb 2024 00:41:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id E08EFD2F0; Wed, 7 Feb 2024 00:41:28 +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="E/rKhbtw" 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 EF5A48F5B; Wed, 7 Feb 2024 00:41:22 +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=1707266486; cv=none; b=GvYnLcInh0Osf+5oKLF00rNry3Hi6tepun59WFPs8A5E3NseGkRehjXtnjoTcYyO5lItuU159FEmi7P+QSXr5LjYMZZkEweONLZPLG+tUkrG8sN3FuFr5SfEwpogr96kZJQSGGcLDoKpKi6V6DetbjLMs6J30GPfwCFIq8m92fA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707266486; c=relaxed/simple; bh=xu1OgSfieAmqr6ZB1/qhT/qsNfkCz0aPs5VpDOCSIUs=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=pUB4xV8FemLztnsD1sZQ/gYcUxaOu9q8uRMVkjW5WLDWtyQFvPXLcxxecSyYYPYjxe5bql5bkk7s04kpb7msQJKGxg6XoqOQNz3KuH55tYEPOF8GWQwii7gCuevNTci4JKiDJwayOEKpS4KjvdJi2NsyPnwKn9IlENWFe/pp4XQ= 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=E/rKhbtw; 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=1707266480; bh=A6Qs5ml23u4lBTJh/n/0jZCbBZW7uELlezDPWWgN0J8=; h=Date:From:To:Cc:Subject:From; b=E/rKhbtwWOJc8LiVaynuOO9xIkqGN+aXx12r2Xsi4yauR4r0/PPWDYg0aKPNtcB8P lrQYtwWEyxtCbgIkEiZF1E8UszDCG/J1vJwO/RAJMCtIlw03ro1TZU+8Se8XIWQIGH z+Bu0Nr0dO7OCp+vD06PPD6K8iRXr5US6wWW1fVaKQsu3Cefo7YxjQ6sFab683Y2eT oM/8uWqF4txJAwV7O+cPQtomCJ4gmzAT+TnP5BG/D0QFiPcE4kIUAezl0oLc25er8s GBi8YOpBA17vV+j0DyC/Pd+n33h2/oG+2STyJqRN90RoaPXwNV5sshBVNJP/U0WBHD 5FA7BrFppLcCg== 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 4TV1Wh0TLyz4wc9; Wed, 7 Feb 2024 11:41:20 +1100 (AEDT) Date: Wed, 7 Feb 2024 11:41:18 +1100 From: Stephen Rothwell To: Christian Brauner , Chuck Lever Cc: Jeff Layton , Linux Kernel Mailing List , Linux Next Mailing List , NeilBrown Subject: linux-next: manual merge of the vfs-brauner tree with the nfsd tree Message-ID: <20240207114118.23541d8c@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: 1790198682870377075 X-GMAIL-MSGID: 1790198682870377075 Hi all, Today's linux-next merge of the vfs-brauner tree got a conflict in: fs/nfsd/nfs4layouts.c between commit: b1f1961080c4 ("nfsd: allow layout state to be admin-revoked.") from the nfsd tree and commit: 7b8001013d72 ("filelock: don't do security checks on nfsd setlease calls") 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/nfsd/nfs4layouts.c index b1e585c1d9a3,4c0d00bdfbb1..4f3072b5979a --- a/fs/nfsd/nfs4layouts.c