From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-oa1-f48.google.com (mail-oa1-f48.google.com [209.85.160.48]) (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 BFA253328FC for ; Tue, 16 Jun 2026 14:04:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.160.48 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781618695; cv=none; b=ODCgx3PBCAsZMiZvdt6kX3y5QbePBdLSwjMAWvUZb/0x4eFhcccrh+dhEvHcKaxTcbtk4ZzQRhw2dLwEls6Rjy5Co5GYmaS71/aR6AxdUFjHHjvsOrZCHBvDA3FnU5cDH+3SRRIDpPgulxEu6aJY3RQ36Y5xOxxj0OqROyZlfdo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1781618695; c=relaxed/simple; bh=378kAbgeCnIbzZ/wqhDIqSSmOdHgI2On5iClxbt7uIc=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=mM9VWkllJj3NrRHsYH64g9FxQtuzZ2u9zuJfHyAVZtVnWkLIHu84XgCcz5rtaAfMuqGgkcw3XFXHusdjbXhImGzDJ1NMBSeXN2ywNRqGE+BkXAX+zlrsSNthdlX9EO6dBpcSKv7f1na7xn/cMLOpTxK2UpcfGkman3c860TaDmc= 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.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b=o0/DnJFO; arc=none smtp.client-ip=209.85.160.48 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.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.b="o0/DnJFO" Received: by mail-oa1-f48.google.com with SMTP id 586e51a60fabf-43bfe209e45so2788222fac.0 for ; Tue, 16 Jun 2026 07:04:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20251104.gappssmtp.com; s=20251104; t=1781618692; x=1782223492; 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=/ewgAz/3P5lAWARWYdlL7x3t/u9xX4eostMbpnjsAEo=; b=o0/DnJFOwoiaBPb0gruQVfztmbYJ2sGWbY/MkX9TieS08sWx/L/FZNZT6ycEo2MrF4 AbtlTsAuIEf/Dgox+MLwvGM45pLXQrznkbqLYQScBx5xEuWOKfuLw3ae7hJIAAczGSGM vPckSzXmRPFbw4pkJaPaSCqcTdfAXUyFPDZLkyWAXMTzzpsfi2/Jb8Hurid00gEADDdn MDrJXoI9WmadPDRWs8Dgr6mO2UTfXJ0agbsTd+y0I00tDUOnRe7v8PtR4KzRgyGSgo9g 09lgH5yaMH5Lt9K2JtJB58KchvwuJCCn3xzDCsY+3AIcmai0pcQ3k26N50Eaa9Jw6RBV 4c5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1781618692; x=1782223492; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to: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=/ewgAz/3P5lAWARWYdlL7x3t/u9xX4eostMbpnjsAEo=; b=H9XekNx2XDXib13Bo4i909CFrUbXP/sxFm+hxqXod0l3YN2QsQqR5TrrQKaVKSoRCj do8/v0drKaBe+iT0/mcimE9iV1/ENI4ndOYdJDE7drEGIOnz8nduDgB54lok0nK+ilU9 EfnEsNMYHK6A6aqQe3K3jGabHofT3WPFZcjMfO06q3NXsVxgq+efLyURlfnH7esorkSi SdwyOFUpKUMszzun5aaQ30eZmYVKopM+mIu/mMSQxFrN8S+mykFBz8uU/ET28sYLC9/W ARrrF2S63v1WEpEJlYcl2PEOSpnFAZOPJQ4kfPLVHlsL7VyRH8zBHbqvacnmzjqIVPVs 4osg== X-Forwarded-Encrypted: i=1; AFNElJ/gSXl6uiXtt7ZArl2DukOqOraK3iMhapBde4eumjCwNJKo/6Wz2EeDsWOxpO5/ECONbOUsaqy7ucs3pa0=@vger.kernel.org X-Gm-Message-State: AOJu0YytgbwYkLbpA1uTMyd4eGs8TGdX37jEIlYN+4lSdnXs9qR0E5rU x7yQGlmmYPh06Ral+YRFJTWP5BuvLBKge3s3X8HER5L4J2rOPqXs8xkriTl4ykVBx3I= X-Gm-Gg: Acq92OFEl024aXkvX1Lsf75NpUlz9kMA8Z6coLILjh8gqSDM9iqQjf95sjm/P29bIXX lzPe0MzvW+o9vtGf9vCm7lRYN7qwgQo/C+2IR6U9UV+6UDdM1rcEgq/qniD/wwK+uaR3sl30bxy uMsPtOTFCNa01NUBM00NzRBQ7RxyOem9Peyqr/faDP3xdg9mrkqju3Tqcu/eL96DfQnffxIbSDT lp0W6YsUFu0AAqgS0CQd0r5ymO4jqlPNGr4TYVGedPq84FAxYEsf7EwYvVP3rIsPOTb8AnGY+eb 3jgFvpFrce7sgRSxkOtFVX8DWN/f/jiKdYl/RyYEpoFQk5FUGvIrSAFYzzVR7hn3sLUR0jBTXNb dQSohORZa9Llx2+xui6+SbHEnOKo8+w1jVDL1z2ll5aeW83mofVMlQ+WyPvaZCb6Uw08FxyP4d5 yMlkPO59i1PuQca3t32/iStSZ9lV2nQsJ5mNJzjhJTLccsm26/F+uctOR8iaWkvdXddr6xbBqc6 hEO/l/13b4EHuL4b0d1 X-Received: by 2002:a05:6871:7c05:b0:442:ae3f:f22 with SMTP id 586e51a60fabf-4430b67f960mr2983986fac.23.1781618692574; Tue, 16 Jun 2026 07:04:52 -0700 (PDT) Received: from [192.168.1.150] ([198.8.77.157]) by smtp.gmail.com with ESMTPSA id 586e51a60fabf-44308fd68d9sm2272443fac.14.2026.06.16.07.04.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 16 Jun 2026 07:04:51 -0700 (PDT) Message-ID: Date: Tue, 16 Jun 2026 08:04:50 -0600 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 the origin tree To: Mark Brown Cc: Linus Torvalds , Linux Kernel Mailing List , Linux Next Mailing List References: Content-Language: en-US From: Jens Axboe In-Reply-To: Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 6/16/26 8:00 AM, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the block tree got a conflict in: > > io_uring/net.c > > between commit: > > 9b40ba14edcdf ("Merge tag 'for-7.2/io_uring-20260615' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux") > > from the origin tree and commit: > > c59e546eda5aa ("Merge branch 'for-7.2/io_uring' into for-next") > > from the block 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. I updated my for-next a few hours ago, I think you're using an older one. Regardless, it's fine. -- Jens Axboe