Message ID | 20240227153716.43e5cbad@canb.auug.org.au |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-82681-ouuuleilei=gmail.com@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp2489071dyb; Mon, 26 Feb 2024 20:37:34 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCXVaS7ZBnrLEhH37nIeRkcNQTF8zFzwMENH8i1TqkN72Xkh7WNEh16dHIFQUK4UhzfeZcFmmmgmVh9MYDohWi95px4nHw== X-Google-Smtp-Source: AGHT+IEFjH3KOonHCsKn5nf8UU+n+XlI72fBCXkVgie6GXdr5VxLJyNtpCehGv3cPfCjvMxSTC3d X-Received: by 2002:a17:902:d4d0:b0:1dc:896d:bd2 with SMTP id o16-20020a170902d4d000b001dc896d0bd2mr8964371plg.19.1709008654697; Mon, 26 Feb 2024 20:37:34 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1709008654; cv=pass; d=google.com; s=arc-20160816; b=Z/zV9yy7oJZ/503Fe10U2k2Ug/JJB40WukFR6uN1XuQcxER844UDrb/5Uvt8zLVi2Y WfNGkjsgfgydTRCtnM4uqS7tBsR33fMnLuAQ5X6TYe46w6wYWW75v93LaFGNDeZJfseH VneWfRNkYPQdNAD7/gKX9C+e8zDGy1RfPq0dfdRaP4alyUGvb4dkLL3N+U26iopKhvx/ KuOh7oxtY0DzdA/jUB5gPGVBjW/c02t5z+1TJ588fNkQKrGvoXsWy3+V/aa6vUwe0TXg +OezmHW3apAL63zr3U7k/kf+IHZrIisb/vFost5JNtEHqqCGUv/DP3US3afWNSmlWsL6 lqfg== 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=E7/eVl4lj6qFejY+AAFd4Wajv0dcTKtdFSHvNV34V0A=; fh=b1QvlCbIlScfzXpGB8DxcDP09flpFHEWF51tQw5ga8Y=; b=LmSHscOm8KawFjf6Rgsak9mFpETJwq0icJopWDsrsx9f4MepQyDvixTWfMBZvXoOP0 tyyZ1kJI/wA+y39zWc3wvWV0SBrI/FQAzvs2j/2+gTAWc5Rg5Br4LfALVqGKDt1vXDuD WRFdya0MYDxmHQCCraFxeAIjb5QIb5y4cpW1qyWX2joJJkuW1jfD182FP8QNr+UqJfT1 LGXkB4c7QW2Rx8cYv/mYdfGwnFYcn87ed3ZqBq3P+ShOlbDTxDUAs/Y/K+RTvK6wB1Gp Ivz0WRVG8irzgPC1cK8WW0I+YEw2nc5mjmH2utmjlossTKEEDKRAAWaGA8FKPJl4ct9/ Z/lA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EjTxN3Px; 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-82681-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82681-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. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id c9-20020a170902d48900b001d8f24096f5si769501plg.110.2024.02.26.20.37.34 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Feb 2024 20:37:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-82681-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=EjTxN3Px; 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-82681-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-82681-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 445C4286080 for <ouuuleilei@gmail.com>; Tue, 27 Feb 2024 04:37:34 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C543752F94; Tue, 27 Feb 2024 04:37:24 +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="EjTxN3Px" 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 3A96552F62; Tue, 27 Feb 2024 04:37:18 +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=1709008642; cv=none; b=CSHj0FZhtB+HUVPYYSe+lZ4uIrLiEyTkxiRSeDTDLmj9iuMfOQS2EhMSz1QaTlI4H4bJeQzqTMhBSopngla/hzwH0ZsytU8MlktPnZIDDZkvUoy7IthTy7Q5vgil0bM9QUrDTQAYP6fQJORI8hPeaJJUFYXU7sp+wWYl/bIN4kU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709008642; c=relaxed/simple; bh=5VXHyMBtZa7eWjetbmpYWhwQ9hodabvVz1cNmWR6fdA=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=lpfHzIjLn622gOKUrcpED1ts25mnWXRSwuRAdkIs8wFPQESA+72rwNsCihJJRrQF6PzLnScsluKEaXGKK0aH2KRmXi33OmKj7PCPJI+UHGumEnn48CEP1LJfNRwxc7r+sBF0JyqBnP6S9HrxTKHX/pAge7ihEKxS5S1faEQ+I0g= 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=EjTxN3Px; 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=1709008637; bh=E7/eVl4lj6qFejY+AAFd4Wajv0dcTKtdFSHvNV34V0A=; h=Date:From:To:Cc:Subject:From; b=EjTxN3Pxqc62nzGsLNwUUirC4idsKmo1Q9Lqb10nkUbyMVraQey0l5VDoK+j1sssO czWY7DtRNb8mnaYxnflYKfMZ1RM8NmwxXDDjJA68cQDXTQPeA3oCuvoHIz6C+Lks+a yKs0Z4O7uKuap8UKvWnx9OhERIcsk0pLUBDPrDLRrmquLiwT3Be/K5/RCPxK6+RF/l m98Y7zRU4QT2CZNZeWNxgm98tV8Z0k9lBjDctIrSMBev9b5ytCpSocPez/jnyl0v1a m2UMRQYVoNoE9gLRDFidLneljhCI0JVz3rzc03ANg6ldpgzLhV22lXYOLWvGfZZzQS RnxV0oXyeqTgw== 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 4TkPpj3DM0z4wbh; Tue, 27 Feb 2024 15:37:17 +1100 (AEDT) Date: Tue, 27 Feb 2024 15:37:16 +1100 From: Stephen Rothwell <sfr@canb.auug.org.au> To: "Martin K. Petersen" <martin.petersen@oracle.com>, Christian Brauner <brauner@kernel.org> Cc: Bart Van Assche <bvanassche@acm.org>, Chuck Lever <chuck.lever@oracle.com>, Linux Kernel Mailing List <linux-kernel@vger.kernel.org>, Linux Next Mailing List <linux-next@vger.kernel.org> Subject: linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree Message-ID: <20240227153716.43e5cbad@canb.auug.org.au> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="Sig_/GhCxABn2pMVAxSw4uUz6Pmz"; protocol="application/pgp-signature"; micalg=pgp-sha256 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1792025294272654006 X-GMAIL-MSGID: 1792025459196246789 |
Series |
linux-next: manual merge of the scsi-mkp tree with the vfs-brauner tree
|
|
Commit Message
Stephen Rothwell
Feb. 27, 2024, 4:37 a.m. UTC
Hi all, Today's linux-next merge of the scsi-mkp tree got a conflict in: include/linux/fs.h between commit: 0e4a862174f2 ("libfs: Convert simple directory offsets to use a Maple Tree") from the vfs-brauner tree and commit: fe3944fb245a ("fs: Move enum rw_hint into a new header file") from the scsi-mkp 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 include/linux/fs.h index f69c082e0f16,bdabda5dc364..000000000000 --- a/include/linux/fs.h