From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 2EE7E3C7E07 for ; Fri, 10 Apr 2026 13:51:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775829106; cv=none; b=Toj7rqBo01ua9C6fyKDHI68lCKCYLzpE8LQdu5MUeSvrs9WRJve+4YPh5387bZIsw/1hol6s4Xf05Evz/OrlGyG9znMNcTVtP3fkrRzVpECD1Af5VIOHec+uJ1rnHQ0MEbBJ18mrbj+kmfAl0FohxMj9XQW6yqQwPjl6+8p8k1Y= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775829106; c=relaxed/simple; bh=ACcZO3EePU25KWacwKzJQOi5PV9lda2Bq7XkrPXiH/8=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=AMLcCdAGU8UC3o93Iyph0UWZiXqR6oJluQJUoO7rtKhem6YwgD7Opgpgn2Pw2PyxLu6M06JkRiQxwh2UfoooxHZD+I6IvS7q6C8smb5TbghAjRwxkG49fW8a5tKRFBvgFBR/G2D093Hk5U/BXS2KorHDCTbGoyblYlPmCDU5iEE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LwRUpyb4; arc=none smtp.client-ip=209.85.128.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LwRUpyb4" Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-488aa77a06eso32685145e9.0 for ; Fri, 10 Apr 2026 06:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1775829103; x=1776433903; 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=2HMPOMsQwc1kO6kdJkjDFsoD/CGVs5/MmxImAa5JhXE=; b=LwRUpyb4YenmYlWAm+BGdopg0oh8iFm27jMH6OSkCMAHg8NQ1bkdyPKMlyi+GDZTdQ HQYltLaSbjCIJFFwVbSMvlc7X2Xf4Lglb6bsjM0GlMM9bu+veJnOMi4AP+FHHEd7Gawn D35YFj+tmpZU3veqLkbNGJ/o7sDV+gb3d7SrI+CLX8le8CjGXUH9+EhqU2VmCckN/zCh cHyBzdSwQh+cxT0+pt5NZqXXKe7xgG/ZphLhL+kRVTv+rTlRaRzIgEVelsk8BZ6Era+L MVgJ9uYWgTgDweR83xTor2ibvFhd+8geIINk7Q++/m8oqkifEFnnIdmT9DnIpw/I3Hxs sGjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1775829103; x=1776433903; 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=2HMPOMsQwc1kO6kdJkjDFsoD/CGVs5/MmxImAa5JhXE=; b=OSkODMdPgNc9HN+zC1BCymhhAHplud1lOaF1j6kfld9l4jHleybBeUJnMxTdRxc4hl UW0v+FArKE4ReRELP1EnNfn3W07vLZP6CE5vSSEkRp1b/Txf89X8mjAquFPc/cXTM18g W6dRzwuMJMAi0E/ud8enzzvJnea+nfmVL6sL4M45eKd95aBV3EKwpub2qWiafkzJC6I3 EW22jqNaLPuAvM5b8t23WBLVWdzRW+jeihCRMb3Y34q7NG8GdDlFKWO7kto5ykT2dw01 emlCtKX/C1si6R8D4VUaRv/N59sgD/xwSd+nTkHO5x2lga8UZ69hyXDi8JRbILuT5fED LWyg== X-Forwarded-Encrypted: i=1; AJvYcCUlcp/Ip7JkVLiJMEpOpD4gfazYbBC7W2XlC/U3VgU283a4qsamGnguR7o0tTvfgY+hcreZithHcYf3Oig=@vger.kernel.org X-Gm-Message-State: AOJu0YwhZnwfq9JyX0csv8+K0nRi7cgiCYqJSOueVb8xi0aYdiklcEIm F60zigPdjJjIWpJih1COKn5DH1S2LZg+PjnP0/Dl9PrGGnewXbhI13Ij X-Gm-Gg: AeBDiesk1PmanHGks5gTHB0m/GzTiwCGp0iXG/Sm7ucl+hYT8IFrneBHyR0jeX4zBpX 6DlDWjzic01MYF/RZ7e1SgqFnrBzJdA9DKkUET3abhzUO6INvrRufF68z1H41pmla5nZ+adPHhh Wb5UMjSVX4RG9skicVMrmu1OOk0BR3R2X5Xwxk3uyoEvLWbwiP3wfBwd4elN+zkLdiUcPvrI1d5 IZhrbGO04yaVLhUMj4X1TQ9RmUhB78i6Tr1CaLFW0WONZqYnGb30KMbKVfPB6WouKk7tfCfO1LS sVdOG/JOxi3btPbPKPC5DLNhCwBMQRnzSUDM7hrLO2clM0nIZNC4hLVrI45W1dZEkPNFKt/3QPs nB+owlrTtoe1UAcAXYpx3TIFwysT4/rSS+FPnJN3pEyclU/8ZIr9Ev0CkoHoB4NF7p1fJVcMtHT n1VWBZdLepML6mrptzBJMjBDaFBazQMOtHqy3cwZ2CciU9jLqvzYxcX1OSEZdGW8NVQ5x2NWatx waNqWN8CRMssAdjH8AijMpMUFfVxgztnlYMkEEHfNtj2GKqDOsrHXazcrFr4GPVtWCnYscuU+yL gqDuxh7jA1Aa X-Received: by 2002:a05:600c:c088:b0:487:338:b4f3 with SMTP id 5b1f17b1804b1-488d68431a9mr30002735e9.17.1775829103376; Fri, 10 Apr 2026 06:51:43 -0700 (PDT) Received: from ?IPV6:2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c? ([2a01:4b00:bd21:4f00:7cc6:d3ca:494:116c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-488d58bb830sm74666285e9.7.2026.04.10.06.51.42 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 10 Apr 2026 06:51:42 -0700 (PDT) Message-ID: Date: Fri, 10 Apr 2026 14:51:58 +0100 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 net-next tree To: Mark Brown , Jens Axboe Cc: Daniel Borkmann , David Wei , Jakub Kicinski , Linux Kernel Mailing List , Linux Next Mailing List References: Content-Language: en-US From: Pavel Begunkov In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 4/10/26 13:21, Mark Brown wrote: > Hi all, > > Today's linux-next merge of the block tree got a conflict in: > > io_uring/zcrx.c > > between commit: > > 222b5566a02dbf ("net: Proxy netdev_queue_get_dma_dev for leased queues") It's the first time I see this commit, but the resolution looks correct, thanks > from the net-next tree and commit: > > 06fc3b6d388dfa ("io_uring/zcrx: extract netdev+area init into a helper") > > 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. ... -- Pavel Begunkov