Received: by 2002:a05:6500:1b45:b0:1f5:f2ab:c469 with SMTP id cz5csp1093839lqb; Wed, 17 Apr 2024 22:57:29 -0700 (PDT) X-Forwarded-Encrypted: i=3; AJvYcCWdO8AKHb9/jkTc/41wZDLaUlJ+Q9JwVg/7gY5VVfn21UFkTtsp7nXCJ9kaHTBh5IUTx9KGssVhGNqmvuXbI7kRFX07IrqWXrDrdCjxqA== X-Google-Smtp-Source: AGHT+IFiTcaxHgmeImwyhVQwK2XBU7SiYBeKe2zm66t/Rwp1gctPUjB2KJCAFobuuqjRq6jkVxp7 X-Received: by 2002:a05:6a20:3d86:b0:1a7:5402:8a92 with SMTP id s6-20020a056a203d8600b001a754028a92mr2182972pzi.31.1713419849008; Wed, 17 Apr 2024 22:57:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1713419848; cv=pass; d=google.com; s=arc-20160816; b=SLLlXEErN1lfXGIQJGNz9MGhkjFDjRiEZuAbnWwMgpo/zgaPBUSu+/1RNleZy1InuP 0KGiFSDoiKcnEEcVdMh03A7N1s1hxHEOk5u9dBYuFI8opjXwFV/FEDXzqRVF0+xaN8hy UQnkswpolpew96zh6GE47k3M95tHkoVAodkVc7EakUERkk+XUnjY6u1KxTAVukccTfe6 uLsKgyWnRphq05BPdk376jmA/wiDSiXogz7iUtQtQ3pmJhvodZmwfwryzaD0zYTzR5Eo 2vsGILxOaPo4OGOvAre4VDKzgszX3BAevXt7aTLt8Fbz8toubgm4ynpdfgIvK+qq+OOG Wncw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=user-agent:in-reply-to:content-disposition:mime-version :list-unsubscribe:list-subscribe:list-id:precedence:references :message-id:subject:cc:to:from:date; bh=EPkI3/Lfd4nekT9M7/fU7oixclKwgHuskeDBcm0iNJA=; fh=CmVx23e//HuqhXylnAbGNBoXrN1GkgmV9gQZsgSgIyc=; b=MK1+CNL1PJJ7avdgdyd8nzZOrU0G+o4SRgpE745MiQqCUIT4LPoQ0bGUjvUaRFSJ4g oNWhZjapTElOtJw9qZSY058dcUTMf0y0f6dwVo0WWhcBImYxSOckj/3PPPNuioLSwRLe iVPDm692KSJJdmjRR3YkD576euOcDlytSshL8TXdeLQHpHR5JavGmiLGFeA+35VyNRaf YFsujRzaI5gvGnTlPHciKtUuerCYHY/NjFq6PDc5FbHko4SSlfSgSAxaqtRGmHsSKxbZ W6le5fx2lz+xx7Dz4LkEddEoPaRid3WbSXuqHnI1UUMQ63XsqMJQkpe4bHt50yaTDFZR 350Q==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1 spf=pass spfdomain=lst.de); spf=pass (google.com: domain of linux-kernel+bounces-149547-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-149547-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id l10-20020a17090b078a00b002a51275cc54si2428724pjz.90.2024.04.17.22.57.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Apr 2024 22:57:28 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel+bounces-149547-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; arc=pass (i=1 spf=pass spfdomain=lst.de); spf=pass (google.com: domain of linux-kernel+bounces-149547-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-149547-linux.lists.archive=gmail.com@vger.kernel.org" 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 1E072B222F3 for ; Thu, 18 Apr 2024 05:57:22 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4D8245FBAF; Thu, 18 Apr 2024 05:57:15 +0000 (UTC) Received: from verein.lst.de (verein.lst.de [213.95.11.211]) (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 69DA255E58; Thu, 18 Apr 2024 05:57:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=213.95.11.211 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713419834; cv=none; b=VscfR6ohdQkeBIglqZADtIuDbTk5zE/SiNFX3QVTnAnKAcdRADgP7EsXBu/QQU9YnviYFW4VjCQXtX98/WJPKHKE5okk50x17dlrNVwDDRXVssSkEvT5xMQyVhXcLHzgMi4XSrHPdKSahMDiDru/HPujmDvuZFKSsLJhXCEJPoo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713419834; c=relaxed/simple; bh=EPkI3/Lfd4nekT9M7/fU7oixclKwgHuskeDBcm0iNJA=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=XGaAkJDryMUsXvQtxMCoydGa/5iAGmcjto9r8+6TuXURunRorsh0hWrdFFjEf60Gn9d7uLwHEJvFp2QMssl9D4nuZ7iX0sNGsBj3KZab/fHl9mnbcGsMLz4yNJoe7PZEJ41nAw6rmK7FKmS2rSPh6fIxemEiIPDTd4e8/MmgWBY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de; spf=pass smtp.mailfrom=lst.de; arc=none smtp.client-ip=213.95.11.211 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=lst.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=lst.de Received: by verein.lst.de (Postfix, from userid 2407) id ECD7E68C4E; Thu, 18 Apr 2024 07:57:07 +0200 (CEST) Date: Thu, 18 Apr 2024 07:57:07 +0200 From: Christoph Hellwig To: Stephen Rothwell Cc: "Martin K. Petersen" , Jens Axboe , Christoph Hellwig , Damien Le Moal , Linux Kernel Mailing List , Linux Next Mailing List Subject: Re: linux-next: manual merge of the scsi-mkp tree with the block tree Message-ID: <20240418055707.GA24656@lst.de> References: <20240418145554.7a93325b@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: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20240418145554.7a93325b@canb.auug.org.au> User-Agent: Mutt/1.5.17 (2007-11-01) Thanks Stephen, the conflict resolution looks good to me.