From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-yx1-f44.google.com (mail-yx1-f44.google.com [74.125.224.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4ECBD26562D for ; Fri, 6 Mar 2026 21:45:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.224.44 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772833547; cv=none; b=gojIxO5OXA7qmacmdeufH1ybZrxCMnMuQANF+R8EyMd8tqMHDnk795n2B5p6tQU9jjMjIQuZxDJdmCYxxKb/i6ScRhlHfmNUSLqrDgbNMFV4vuqWmREREVQxxTUROhkXi//6CapFBzJx5VjlXT1XHrYOcp8VmF14XV6r9dHQhvo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772833547; c=relaxed/simple; bh=ygiioQO7YI1Z6+YdsvW6u0Sg9VNyGI3V5/zfCTppg/8=; h=Message-ID:Date:MIME-Version:Subject:From:To:Cc:References: In-Reply-To:Content-Type; b=huHlsEFTl3vu8s4NbZ09BZQ59nKTXbw62BFYdt1WO/uogDVeZ9peFKu4tF7vTLnB75UGKKQWhX7NGz0dPvLwyhEsTVgiKPI7CKfNcuqkPp54ZDnwQm0m+XxH3xiS4qFnYFm7Z+1TiJIwF5COLcQwWSuJLGdZy3QL8Siz63AR02Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b=HXM4gRak; arc=none smtp.client-ip=74.125.224.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.dk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=kernel.dk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel-dk.20230601.gappssmtp.com header.i=@kernel-dk.20230601.gappssmtp.com header.b="HXM4gRak" Received: by mail-yx1-f44.google.com with SMTP id 956f58d0204a3-64ca1ba0089so8971920d50.1 for ; Fri, 06 Mar 2026 13:45:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1772833545; x=1773438345; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=FUeQCHJX6OavYXwy7bj/hOulhUCnwzMyCKLTg4avOsk=; b=HXM4gRak6ooehdTKLWKnpRQYFt2TbAI6pllfdiSbjMJyxgZPODcdqgLYsCfMwc+rub /8617/X257zld3mOXbQLL+rT+Vmdv7wwmhBh+h52BNFgmds/0d9lZcc55GftgZj/Afsc vlgTMxET2Cy/sWGnBxkf0bFWwG7opQcawuGUFqs5usyovnaAK7llf5WIkdfNcvRIrmey /qFffgDiMFGf3gt7vSZfG2HFf2cGnzrW16x3fKT7ea8LEt803KrIBNogM6789BFq25YM saHo8B4HGKFDyxyU7uavf4rKj4Nqzh4t4cw/H17lRGIJb2bii/hJCmrZNjHoDDb4pgnU JFmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772833545; x=1773438345; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=FUeQCHJX6OavYXwy7bj/hOulhUCnwzMyCKLTg4avOsk=; b=LBuxRMEyNaO/f4bP8wSltU56XVc0laPYfn9073Z+cohhLgy/hrGIjot/dCKatYvntQ mpFF1+sqE5NbgW3+FV7Y4KjilT6oWTaQcNr0nWDDm6DDaVowzOwfQt9QOhhkWoOKs7mD faAsidUI4OaHo2x9cvcB5sne8psFSpcDMM0qRLpfsskhi60tywGZV0j57JWgXHfBjSrR cFkXc3KXdrXwOr7HkU7uEQni3Ml4SdXF2TDV4UCkMXFewP9q773aI3y2Uese29wPQqEk 8EDpnw6bDrC2H0KlITDlA8v+KAnEr2L3eXCX5oiDktVfKUzimg8eunmiCfm5sXC63BdJ l0Hg== X-Gm-Message-State: AOJu0YwDv5+l4od3ZidlkaCcipXvN7wkxjUq1112LxRPGFvwb+BJ10GM 50CiFQapdvLxDo0oYI7oqIiXUgh6umGlUifw8mXmMWPsRx6v6e6Tk29b0u2antaaOYyfPZ2X7+T brnvXcmM= X-Gm-Gg: ATEYQzz47s6bW8WRLYeR2VNUy+N0EHU7NAirLDZm2QzhLCLpFSmuVGprwTpnTVk8JH/ dZTq3QVCUhZRdac6IXnG/9/gor/1fcFvtrdsTXQpOMniDnaJHT7X9qdBVH8GEPPvqsFtMSqjwF0 v19OwLlpoeZx61JoiaS7t0JDxF7tURS4j07PHoH4+E0cv+mVDiZGlezV59fOsyah8F14zsUmMp0 qmBCgGS7/iIqzSvBCslV+6TIjfYMPCxMeNzbRKnTqq0OWgw5DzmX3HWnDGLA8CegPf8YS/lOzYF X10736StP9fiRBEmkTYcV+MIk6yg1btqVBg2aXEfLBO6e6WJjZuvnCBitPDCzYXMKITsOYUw6Md ds6XQeMTj9IzqJiyzXwA7qsCMHtwi0NVY8tPBlhfv/KB+l9U8t5j4jtq9v/VE1yLwHmGbf+UA6y 81Q2YBR0CQtFAVqXszzNxUCvf/hX5zTUCysFeyVTp4F9BFp653WscCXiqJPsmfxMu3siBIgY4T3 O5U5Fbef4SxU4ybEw== X-Received: by 2002:a05:690e:1510:b0:64c:9a36:ffe8 with SMTP id 956f58d0204a3-64d14203ac0mr3579672d50.39.1772833545340; Fri, 06 Mar 2026 13:45:45 -0800 (PST) Received: from ?IPV6:2601:703:4183:37b0::7115? ([2601:703:4183:37b0::7115]) by smtp.gmail.com with ESMTPSA id 956f58d0204a3-64d175d325dsm1278141d50.4.2026.03.06.13.45.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 06 Mar 2026 13:45:44 -0800 (PST) Message-ID: Date: Fri, 6 Mar 2026 14:45:43 -0700 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: build failure after merge of the block tree From: Jens Axboe To: Mark Brown Cc: Linux Kernel Mailing List , linux-next@vger.kernel.org References: <19E0B569-A6C2-4DE4-A010-20F4E199198D@kernel.dk> Content-Language: en-US In-Reply-To: <19E0B569-A6C2-4DE4-A010-20F4E199198D@kernel.dk> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit On 3/6/26 8:42 AM, Jens Axboe wrote: > On Mar 6, 2026, at 9:29 AM, Mark Brown wrote: >> >> On Fri, Mar 06, 2026 at 09:13:33AM -0500, Jens Axboe wrote: >>> On Mar 6, 2026, at 9:09 AM, Mark Brown wrote: >> >>>> I suspect I ought to be applying a merge fixup however since the block >>>> tree obviously isn't intended to be in the state it's in anyway I've >>>> merged the version from 20260305 for now instead. >>>> >> >>> What branch are you merging? rw_iter is just a test branch. Next should only be merging my for-next branch. I’ll check later if I messed up, if the above commit is in my for-next by some accident, just drop my tree for today and I’ll take a look later when I’m on my laptop. >> >> It's the for-next branch, the current HEAD of which is the merge >> e356b1868a62cf4a650b451a7296ea4762038666. The first parent of that is >> the fixup commit, the second is a merge up of block-7.0. Looks like the >> fixup ended up on the wrong branch perhaps? > > Yeah just have! I’ll sort it out, thanks for letting me know. Sorted out now! -- Jens Axboe