From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=74.125.82.177 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1792516406; b=M2x0K8NXL1uvbx5Oii5ZLwgpeYw3LN+Al8SL642MFk7OQALnfnDDOyJalewoyS8eFCTG g7l0A50rTnnclBbWqKvHsn7WllfpkEbwFf7/nnMf0lum7haBDAv6e65sXMXwbCsF/mEeK D3t+ouotBe4nnPFfzylZks4Sy5mbunskWlJNkFRiOXO9q8zqH8rVuT1XJ/BSDXpMIbHOi TuiKoOF8HDV+vG2aFGSLRwra/fo63WbmjIexXH4teTNxjh3Ah48DefqSTlxAEVX7FMuWm jIp0V5TftF2HjRBwUM4Eh8ktHyJKO7WPtOIk6I8aj7u9HklSLO0M9r3CpjzLz/u1PRA== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1792516406; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: Message-ID:Date:MIME-Version:User-Agent:Subject:To:Cc:References: Content-Language:From:In-Reply-To:Content-Type: Content-Transfer-Encoding; bh=e4OwnBidoAfAdMjRbpbOO+nJHA8rafIGJBLITYtbTdA=; b=oPwpkinIthkigv/bEeCkhJcUX7qGW3dNPCAJ4gL8pQaQ28A7jXv/xpya3+MawaKD/4RL DPFm7NxIqo7yz7yGZxVBstWpIMF8Z4121ImDXdiGuvffBTd/ljPUKV+F7+Fl/IFEBjjqL ICL2dNVGuAuYTmduwF3RAz102jzuY+DtudPnX1INvc4IPCZcIaO+DqWiiGr73xuavk2Ia KXfXNYz0VlWWoWE0qvBZD6WfmO7yIehQl+Wp958kyufIXZodk7H7KNQ855w1gUOiz61L2 trKvuUmnPjwsDMSHWFowTfYGnX0s/KNRjtDCUwTLNIv4Zb+jj7tx9fxQRm0cOjqm2Ew== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none header.from=kernel.dk; spf=pass smtp.mailfrom=kernel.dk; dkim=pass header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.a=rsa-sha256 header.s=20251104 header.b=rnowydY4; arc=none smtp.remote-ip=74.125.82.177 Received: from mail-dy1-f177.google.com (mail-dy1-f177.google.com [74.125.82.177]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3CF18606AA34 for ; Tue, 20 Oct 2026 17:13:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org 3CF18606AA34 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, unprotected) header.d=kernel-dk.20251104.gappssmtp.com header.i=@kernel-dk.20251104.gappssmtp.com header.a=rsa-sha256 header.s=20251104 header.b=rnowydY4 Received: by mail-dy1-f177.google.com with SMTP id 5a478bee46e88-35c76e9614aso6390481eec.0 for ; Tue, 20 Oct 2026 10:13:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel-dk.20251104.gappssmtp.com; s=20251104; t=1792516405; x=1793121205; darn=vger.kernel.org; h=content-transfer-encoding:content-type: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 :content-type; bh=e4OwnBidoAfAdMjRbpbOO+nJHA8rafIGJBLITYtbTdA=; b=rnowydY4LK2PVPe3cFHeHwMC4sA2LE2zUvuRLfnIO4u694UiyX7HJZ7ND++Kgr+yXT npBlaJRY3dd6vAn7WahZfV2KZKH3AlVH7Uax8Es9cRBb4Hc10nmXcujwR/VVDnMOzsZi Kchfv+VrKzu5bk42KbHfcI8TZRnxja97MVLmsTgvNONBAHIIM+x/yF+c5f7JTPdXu7Dr ODCwwqCikI4c/gbwrn7/GKDOF6lANS7hyCj4beMYydWx7//tUkdAwRL0RUq4UnLw01tQ Azw0Ctcdk+2ZIsTkRX/7aTm8V9lRUp2nfNkywv5Hvwivk+Y3tPlUHwHxZYPuDSdP7dze hTzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1792516405; x=1793121205; h=content-transfer-encoding:content-type: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:content-type; bh=e4OwnBidoAfAdMjRbpbOO+nJHA8rafIGJBLITYtbTdA=; b=Xq9wyC4X8svmvB8k1Nzd6sFJ9yM+dftQurDpLXeqcqmyoD3t1uyX2bW4o+XsXUzA4a uKmmWpKzbwNwYLkLnFlAg0kVMneKM201YQy8gSNaVCLu/Vc/MV+gBWTyfMWzgiXI8TjR 1Dw/xyCoV/m55btxxpaCa2a150C0GQQemGWOhSR3xXn89h9mIdYFuXtadybsf6aXujZO GCF7K1+rzNxys+AdzIlhf5bhd9aHdB0tvWKvuRPzWKIrnv73WzTPCxSva+QsDuuGu2xl y+Gb/2BEDTNcygqD6+fsP9qljaRT3Jvn0SNkECK8YFMn2EziyZhoeJiceszqp4w2+aDq iAPg== X-Forwarded-Encrypted: i=1; AKwUvBybSFrg24dsBDU4Gg28X94nSR9aS0beUb8tU51Upz8qQtsqMxbFA+1ysj51yotamBnJ84NFwRbAk1ZD@vger.kernel.org X-Gm-Message-State: AFq9FYKwHDRzapDorJ8hnYDuLRdZGwxgYTO0rwJiy0DFN+BxS4HLKRip OPDTvO0+9+GkfKCL7/+FVjgbS/ubkWi0P9rn2Losqt6wkcjxJ1e9lkQsI7Sz1BgA8cw= X-Gm-Gg: AYBFou2e6e6lbpq1lRZSCj/hyxOE2GM+kuL6HRjHUEcddUByPjZSzIB5Wm9zVZUh0X4 YUAT5zskV0l3RNdbv/dLata4XgGI5otssqu61sUezod4zFM1qdIA2FKwIu5xQ0rJ5n9yWU7vVHY 9d1JSF2uyFos9i7XQlpmyQNZ/Fmyz0Uo0+kkNeTrhfShPpaNvKhgmRCjJXwwZYUEY2bTD2+BP3W 303FUNhxb/bZMq0Zl//raYw8CZMur2HR2x+PD7Ad3k4oAirgnaqJmzmY9ggPbJ+cULRmmn/Qzts MyekWvxi2Tcfcm3IFBUchrbH/LIvZEV2YTga11sMskP2AMjRnct3kcw48pzohDOht2DjGRW+6bE DTCuMEmf1LFObZwCIbvBzHnKyRbHmXh7o70aypI+IDWHLRsdt2UAAqKeCzBlzXO4A9/xDuW14QQ n4l1UpM45wgSBw+YY26u/R6HAOOfoSiwXyIw/3miI+my4OaRebY+aMYlNJL9JPnkL8emGJHZ2AH hdhI+2HbYHQZNqllCOKQR2yosB+GfrO/IJDF6ZjlijNjH+PVGOdjaxiAd+3G+V43aOcf0rFp+G+ X-Received: by 2002:a05:7301:6195:10b0:361:6884:78b1 with SMTP id 5a478bee46e88-361a253f345mr15767601eec.28.1792516405245; Tue, 20 Oct 2026 10:13:25 -0700 (PDT) Received: from [10.61.8.29] ([155.98.132.5]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-367405ec6c3sm35919eec.7.2026.10.20.10.13.24 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 20 Oct 2026 10:13:24 -0700 (PDT) Message-ID: Date: Tue, 20 Oct 2026 11:13:23 -0600 X-Mailing-List: linux-next@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: linux-next: manual merge of the block tree with the mm tree To: Andrew Morton Cc: Mark Brown , David Hildenbrand , Linux Kernel Mailing List , Linux Next Mailing List , Mike Rapoport , Tal Zussman , Vlastimil Babka References: <553dc087-b5d4-4aa0-8e84-4de6eaa45847@kernel.dk> <20261020100055.3e388e03fcd804f0cbde04f5@linux-foundation.org> Content-Language: en-US From: Jens Axboe In-Reply-To: <20261020100055.3e388e03fcd804f0cbde04f5@linux-foundation.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit On 10/20/26 11:00 AM, Andrew Morton wrote: > On Tue, 20 Oct 2026 06:45:16 -0600 Jens Axboe wrote: > >> On 10/20/26 6:27 AM, Mark Brown wrote: >>> Hi all, >>> >>> Today's linux-next merge of the block tree got a conflict in: >>> >>> block/bio.c >>> >>> between commit: >>> >>> d4ee6948bcabb ("block: restore the iterator when rejecting a misaligned bio") >>> >>> from the mm tree and commit: >>> >>> 73a0ff6030afc ("block: fail a short atomic pin in bio_iov_iter_get_pages()") >>> >>> from the block tree. >> >> I suspected as much when I saw Andrew pick it up. Andrew, perhaps >> let's queue it where it belongs? > > I was hoping to get some review feedback before sending it over > formally. > > I'll send it now. Applied - can you double check? Flow is a bit different in there compared to the one you patched against, entirely hand applied. https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git/commit/?h=for-7.4/block&id=40d070cbb1906896d6fd65c39722d2411830ed9f -- Jens Axboe