From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) (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 C0FC6211488 for ; Fri, 10 Jan 2025 15:02:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.166.49 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736521369; cv=none; b=RrWVJWoG8AYbUywwe9MXPpR6vog5wALzVdvxzDhTmlE+Fh/5YhJQ3SjXvPPuMRJVE4aYPr3ywhUYuTE3BVeFPDOKD8E42EXnXuB4+ilQ0Aj7yPc5o5uzJo0Ft4wnk6t0xEU4qLfPwn30U564NmP6mwltFqGH7f0z9TfeYfssGPg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736521369; c=relaxed/simple; bh=rf6CcJMEMkWJLbVR755i17pre52sTWSm+8n10NRmPwg=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=YIrZxsHI0WuyiQPnZU8laeXuSgIZdMyuj4iUmyrllA+4IdZw8vk4oEzWPl59K4ejDHbVGfpJ+G0hLqannBqZSSCUlnB7X+Zn+C7CF5crWuhNEFgCf7MxNpCfQTZRZaDccsyT3AEkZOw+wMaq0pQ8Z0hkrD+gsY7ckZBCrVOG52Y= 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=0WLMew2h; arc=none smtp.client-ip=209.85.166.49 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="0WLMew2h" Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-84cdb6fba9bso145916839f.2 for ; Fri, 10 Jan 2025 07:02:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20230601.gappssmtp.com; s=20230601; t=1736521367; x=1737126167; darn=vger.kernel.org; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=sKHq1I4+wS23tZRiPsoNDVnIf5eOdGV6U4W0dd2CTxw=; b=0WLMew2hMlQU6a8PgFTniI/R8U/xJN57z3r58A/7kH4xbXBWNT2uTXBJp3AvCVYjht XMSTH87K4JMgtIzcu9uzgEvrdqy3/od7H2XCC1u/NqCfnTB2lO1xpYGP6v4D7niwxfHu G2SkMGWyyEEKJV72bjLgIVYS3h78cN8KWY7t6HJtqc00RDN9T3ZK/zIpT1tkrQqpwKev 0neAZBMZzwP8JDpCwdH/DVvyouf3QqXl8rosOAimTtnKTJOxNqEjHY1rGx30i8iBhvmi 1QrMGI/XCHYse7ZhoXeZ13Mi3LbOTFP96VTHn0H1ZNqz4boK5BKXu/S4L13R01cAZVCS vPKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736521367; x=1737126167; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=sKHq1I4+wS23tZRiPsoNDVnIf5eOdGV6U4W0dd2CTxw=; b=nbVTTcYIc/fLoO4SZeRPKLk9WtrQw/SWRfpTlVdSU4nGnSS6TTt1baHMK2/yrpRk22 njYrihRf5jRn+qsHLIYlyPnKTf/dHCGw0C+vaXbYxiW/ZKj6JPLrodTXThes1muqNfEk wm5NU/ds/FfiJf+txpN5FtEtoKCO7jmkdpg+mkr+BIW9km3wnvNqBodFkBVe55ymPWkQ RyzXlDWcHJVn27HuAZnbc4eoXwfnvkoYO5q8pdMT45sjQom8JuKBNBN3VVWMA6MYLe1g AIYDTWTvX6k+WFid5NVnCstpNCCM+3wM4x8cL7mlBhNBjv6JoaYkyF1ajABGj0t9rNZ3 iTWA== X-Forwarded-Encrypted: i=1; AJvYcCVvAMY6DrlVTUAegLZN9+eCnV3VK9D/rlzRpgOL54Z1jhGB4J6+ZqbBv5cHPE/1aH4w284B5R7XvoVWpmo=@vger.kernel.org X-Gm-Message-State: AOJu0YwyYMxVP8Akoh5/hx3RvyqvCzZkUx3e1nRwJtS010FgxKWxiHFm MGc9rKBoalkB7Igi+wTkDbFTQJOxy8wxDPnJ99O4Y4RQC7duvLtlvNcpUMCBCaQ= X-Gm-Gg: ASbGncuB67IDw9t8bSMb7SpPide3Lu1NY/r4rK/lXPXe06tTgheU/msJMDXrbsWy6RN 5w9sK6pXr2+08pTi23OmemOkhs89Xdvj7cV6ZXJjUzNhaxO8N0Vmp9YpzzD1ZEbMx/a0bkt5rxl 8kTBuOLXJx6UCBnUYVMdEkURN+0e6om3dk6Mk8TYMd2N8gr7ika4lWCJXa3DcnsXUFe0YBZ/eAR M97n4B3lIrB+vxyAD3dVrxaSQjUR3+HNtjT6iIaJdw7WgxqkYRQ X-Google-Smtp-Source: AGHT+IHyLhnHpkW1aRd9Uy/4dFtRInCS77Ck4Pzm8qkgIw4buwcaWXv/o+BaPPgFubE9f39qTvqxhg== X-Received: by 2002:a05:6e02:3a87:b0:3ce:394a:ad4c with SMTP id e9e14a558f8ab-3ce3a88853dmr84298645ab.14.1736521366894; Fri, 10 Jan 2025 07:02:46 -0800 (PST) Received: from [192.168.1.116] ([96.43.243.2]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3ce4add9b01sm10150675ab.40.2025.01.10.07.02.45 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Jan 2025 07:02:46 -0800 (PST) Message-ID: <00e4ae73-f4e5-491a-894a-8f6f166c1bef@kernel.dk> Date: Fri, 10 Jan 2025 08:02:45 -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: manual merge of the block tree with Linus' tree To: Stephen Rothwell Cc: John Garry , Linux Kernel Mailing List , Linux Next Mailing List , Mikulas Patocka , Milan Broz References: <20250109124617.1b4ff0b8@canb.auug.org.au> Content-Language: en-US From: Jens Axboe In-Reply-To: <20250109124617.1b4ff0b8@canb.auug.org.au> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 1/8/25 6:46 PM, Stephen Rothwell wrote: > Hi all, > > Today's linux-next merge of the block tree got a conflict in: > > drivers/md/dm-verity-fec.c > > between commit: > > 6df90c02bae4 ("dm-verity FEC: Fix RS FEC repair for roots unaligned to block size (take 2)") > > from Linus' tree and commit: > > 5c292ac6e69f ("block: Delete bio_prio()") > > from the block tree. Thanks, I resolved this in my for-next branch now. -- Jens Axboe