From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 036DDC3DA5D for ; Mon, 22 Jul 2024 01:13:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 19D8A6B0082; Sun, 21 Jul 2024 21:13:01 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 126AF6B0083; Sun, 21 Jul 2024 21:13:01 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EE1E36B0085; Sun, 21 Jul 2024 21:13:00 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CD5DD6B0082 for ; Sun, 21 Jul 2024 21:13:00 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 484CF413A0 for ; Mon, 22 Jul 2024 01:13:00 +0000 (UTC) X-FDA: 82365614520.26.CD47266 Received: from mail-ed1-f42.google.com (mail-ed1-f42.google.com [209.85.208.42]) by imf16.hostedemail.com (Postfix) with ESMTP id 07B6F180009 for ; Mon, 22 Jul 2024 01:12:57 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b="S/NlB0ZE"; spf=pass (imf16.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.208.42 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721610756; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4Ks9M3kzBCPwupF4DA1Vj4pSXzb7G5/N05vKszYZASg=; b=XVG/R4zJ9lCa0DJ5JvETu7AFN9+WDjpvha7fiI65C8EJrqyHnjczP7Nlc519+jk1WsIFrX 3UfM2MI82ZQSRTC4KfV4vVoBzDCGQXCMn8LNChEjWordJEyw/xDiq5LlX0P9NL9D/gy0bm 9I5xJADr+816sYEMhH113waqN+NaHQw= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=google header.b="S/NlB0ZE"; spf=pass (imf16.hostedemail.com: domain of torvalds@linuxfoundation.org designates 209.85.208.42 as permitted sender) smtp.mailfrom=torvalds@linuxfoundation.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721610756; a=rsa-sha256; cv=none; b=fMrh5FdMOxdUnF/nGLXqRjPOgOKnFmX0poxUCEC7zUFGnVg7snChZDT3sEZ942ydmrTp7I bZINGHQtkNzW+xyUGwcLA5T0BGEQgm2QUfU6hgvEe859912TF790gvCiyWcKQQUU1DcLXH WrkKRZEwAIM50KW9FHW+z20teIZwwv8= Received: by mail-ed1-f42.google.com with SMTP id 4fb4d7f45d1cf-58f9874aeb4so2628659a12.0 for ; Sun, 21 Jul 2024 18:12:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=google; t=1721610776; x=1722215576; darn=kvack.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=4Ks9M3kzBCPwupF4DA1Vj4pSXzb7G5/N05vKszYZASg=; b=S/NlB0ZEQlmp/t9J8nntbRHsRN8WkEDW5DVp7P/AWmu7YpgB9qZt+JmI9wlC32R2pa HS+APZbTyquFB/jkZ2dXnmPj1cMcTxDiWUOZOtt9h4aG2TVdzO5RKUp9VGukY9bA2NsP I9uW3Iny9NK9MD/LCp7mE4Rbo9Cb5OnJQwAUc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1721610776; x=1722215576; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=4Ks9M3kzBCPwupF4DA1Vj4pSXzb7G5/N05vKszYZASg=; b=qZyop28AvpKo9VzxN7X2GsajooV713aZ14dbUg9Xm6sNXcpCkkrNyQDzMrWbdRjmTs P4R3Q9vwlLjXAYy/PD9PisbwP8O3dYARkYGIF4wTzJwiDKQf0BnWOeX0Cpy+TmmF7pBT +9qp5XkQZ+XjuYgVnCH9lMnbC0xwrrOYo69hy4e9yyP9vf2/BIlVv8GRudlTxrr8rk1b d6nNuKQRn8BByDYff1CnbGGSw2/8R2y2IXiM7yMWtpHR7ASkMuucEdRhxGb0u6xEoOso ufIFlp4X3a84F/d28e70gzCNbQDlmsrw6NReoxuDHMDbL2KADBaYCXvBSo4+DOioVIff lMvA== X-Gm-Message-State: AOJu0YzirFxuO50ytKAxlz5mnme7QLEw3fy/Zqj8YVZXczOedtVy/C0V n7ZA8DOpapeTkICxcj/fLMW7U3F277XjNqhH5jRsFwLsR3OU+EP/6rD8fTNoH47zCimx3vyZl51 ybvQ= X-Google-Smtp-Source: AGHT+IEFeMhyrJSHrMuxdpsUu3zFHnW+8lSArbZ2IjisXtIekOwbRFvSlbXhus8LoWBNMwv1cKCSXw== X-Received: by 2002:a50:ccd8:0:b0:58c:804a:6f03 with SMTP id 4fb4d7f45d1cf-5a3f08a606bmr3637184a12.24.1721610775916; Sun, 21 Jul 2024 18:12:55 -0700 (PDT) Received: from mail-ed1-f48.google.com (mail-ed1-f48.google.com. [209.85.208.48]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5a30a4d73cesm5193306a12.16.2024.07.21.18.12.54 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 21 Jul 2024 18:12:55 -0700 (PDT) Received: by mail-ed1-f48.google.com with SMTP id 4fb4d7f45d1cf-5a20de39cfbso2796763a12.1 for ; Sun, 21 Jul 2024 18:12:54 -0700 (PDT) X-Received: by 2002:a05:6402:2114:b0:5a1:ef24:e9dc with SMTP id 4fb4d7f45d1cf-5a3ebea7d26mr4934512a12.0.1721610774619; Sun, 21 Jul 2024 18:12:54 -0700 (PDT) MIME-Version: 1.0 References: <20240721151013.b9b331ce79f5f60c54c69636@linux-foundation.org> In-Reply-To: <20240721151013.b9b331ce79f5f60c54c69636@linux-foundation.org> From: Linus Torvalds Date: Sun, 21 Jul 2024 18:12:37 -0700 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [GIT PULL] non-MM updates for 6.11-rc1 To: Andrew Morton , Kent Overstreet Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, mm-commits@vger.kernel.org Content-Type: text/plain; charset="UTF-8" X-Rspamd-Server: rspam03 X-Rspam-User: X-Rspamd-Queue-Id: 07B6F180009 X-Stat-Signature: ksirg1sgygqxzb4s8wqo61ew9c6h7f5g X-HE-Tag: 1721610777-865648 X-HE-Meta: U2FsdGVkX1+PM9jokKmxaDi4qW0S0k115qaR41IurOe2nHGKYTApCZWen9ZWaW72yI+M3UyqQutF58qTApjOI/X3DRq5LrVGjAr9STsuIL6u24sA5bqQZn5+1/vvRKeDRQxvyxeBVLWdLt6A9+KP952L5MqHYidABS2GFUYandNMk0c8HKSWGUQgKZjKtABGt5ZHmqGJB50BcqWg0BgHH7iXp9cFbqH4EnnqTsgatTde9jaqSCbuRcwxVCIEIGp7dNW4VlE4+d7XIHQeNKmGTKIP/D/gyxysIOgCKIba02fJA6xQ3cMerRVyG4r56ldKFVjlMFd53S9B+koh61y4/2uc16Y2yvv9uyWmlL0DpW/ZI5HW4WyzHSSIwDFJH8Oo/M0e1lglkYmCSGMoM8ZtlCTH2dFh35WreDZpylZNX5EB7bETGpJL7+Nkye7hWbx1Gm6pPAHJAGfNmv+E7X2afqq47EuJEDw3zlULaEflmQSDXZ5LAf9YodwAG+YO+1Dru0D93OGxa0gz4ugv0CjQ+VxWwBTlc4YL9jFQqkbUCNCFb4gz9PURQgeiCuclVDOGuTd2ytjOs1pDUj0orkTSf3DvIr+aQeJOKFrjkDDRrjefi3cD8ctOg1B4rBxBqAzMZyS66PDU2Z7BrVsWQ2HXmGEkHt20W2kIc/nrH1NlHLGsX8RMu68DG1h1nl15eZ0vwn5ibA2ZW8uvzdXI29baFxKIt7xsvV9zKa+MXQOaOV3QAHCrUwc1msnFW9RlI69hTPApN8Ykp8xRtgN2b95my6YZnHOzmVy0fzVS3fClZaZlNwX+mBnfb7zmi54JwWTJvRr3e6Xco69Pz/4ZY7iYluO8qVzyWQvAZrMRkw1XeOtlRrJnOUwglK+QmicvuQkHKC2qmiXStnSChy7wn/c31ktJ4bZQRFLD86ExOTTi8MSlf6JcT3f2Fgh4iwi/s4k97yHCr23KWCsPmX8OfAb GnwlYhnm w28IXpl3vwe8DbypmbWhg+/zeXMVALKW9z5Hvf9ctsKh9bSvmq8SJNcn1cPuSy0i5d8ygoL79nPfJAvZhjihuOJIhSye8SyEsCD9Cs6sumWRIkIISlGkiVf+PMf0NGbyvGJqtfc2EfbhyYpUn3QlrJLbG91/teRaEnqdJIqLETzHHqA9sL2F7nSBosO93yWmogJaOe+VYGoFrBt2BnauopheLfTEi4Gyc+AVl1N4jOETgJVgL7QxfIxIfIVloXsZ5qsDuT+oNReQqTvvj8QGD/XRWe+CNf+9BgG2NSd6aiPYtIvtz5Z0UPa9KdJL+aPf+/2i8KkzPHhbzVhYvoqylTSemzULbCgCPuuyi3CkqAhb+Kfg5DJ/nbUc1cLsoy4ZIx+pPEYRV+/YeiVKJ5ejdB9La7rVOnu2Q6l10WcUisVFJildnelrhcA0fXXY4g9UllX0z44j+DOl0UONBuHsDgIt3h0VLw3y/5R7MgTf+7XAE9jJ+nZ9UK2XPUfzKlXHw7Uyt X-Bogosity: Ham, tests=bogofilter, spamicity=0.000022, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: On Sun, 21 Jul 2024 at 15:10, Andrew Morton wrote: > > - In the series "treewide: Refactor heap related implementation", > Kuan-Wei Chiu has significantly reworked the min_heap library code and > has taught bcachefs to use the new more generic implementation. Bah. I think the users should probably have been converted in their own trees, instead of having this thing that caused a somewhat nasty conflict. I think I sorted it out correctly, but I'm not seeing why the bcachefs conversion was done outside the bcachefs tree. (Ok, it's not like the conflict was all that nasty, really. It's more that conflicts in this _kind_ of code is a bit nasty). As it is, I do see the Ack from Kent, but I'm going to ask him to also double-check my merge. I see what happened in linux-next, but that state also seems different from my tree (at a minimum, Kent also moved the tiemr_lock around a bit too). Anyway.. The conflict resolution looks sane to me and doesn't seem fundamentally complex, but (a) mistakes happen and (b) it does seem like this whole heap conversion could have happened in the bcachefs tree. Kent, mind checking that I didn't do something horribly horribly bad? Linus