From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6C73836A03F for ; Thu, 13 Aug 2026 22:42:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786660958; cv=none; b=ptDQ4mAUcTD9cNnPyHFHU/br0F1FApn++t5vjqfLzUD894KOYBDhqmas0RoWzbgfNUt1+PndHB3mMkqE3VWXWqrCd5kY0te5furlYSNdtHzbctmSgr4PXSRc5oDja6U3Pl3HqRFmi4QeSar+Nv7f6qv6Xs/hNxZDBTN3HKQdpNo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786660958; c=relaxed/simple; bh=1qTTHJ8Ww4QQoJzWD89ouCbgkK2Po7pl9Z5Qq8JKIt8=; h=Date:To:From:Subject:Message-Id; b=SX0+ssZMMwqvbGS23y5BaAja/pCKTyx6SD/mtwKqXtQJcHxBkXpfoUEGTjnJGbmTsWklR/5GkwfMYS2cUjjH3Ykw2b5eC9X1iJoFl9Xe06YJ1axeICTe7sNqQsQeo5RRYDAotqOBc6+k1u730rngzb9FBGWBFoZO/6e2kjdqEyE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b=aC6A9Lfz; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux-foundation.org header.i=@linux-foundation.org header.b="aC6A9Lfz" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D8BEA1F000E9; Thu, 13 Aug 2026 22:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux-foundation.org; s=korg; t=1786660957; bh=owwoRn4NqkIlrcpn+SoViBKdRqixYT/ho3GU9hMkBNg=; h=Date:To:From:Subject; b=aC6A9LfzP1Rz1Prz7WvkvCTCTyFBvmasaxnClBW6jUrdIip1EfB3xTTqbZLZ+cG35 yyuGPdZX4fiM0xJZHLjECQyGtCX0NVSPmHy/Sf2Nkn4NbovW/KRrhJ1pkrNvitnUtn X6+Rmo/RAe4Oiy/OZ3feTOVY6VEXWu8k61zQRMys= Date: Thu, 13 Aug 2026 15:42:36 -0700 To: mm-commits@vger.kernel.org,lasse.collin@tukaani.org,thorsten.blum@linux.dev,akpm@linux-foundation.org From: Andrew Morton Subject: [merged mm-nonmm-stable] lib-xz-replace-min_t-with-min.patch removed from -mm tree Message-Id: <20260813224236.D8BEA1F000E9@smtp.kernel.org> Precedence: bulk X-Mailing-List: mm-commits@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: The quilt patch titled Subject: lib/xz: replace min_t with min has been removed from the -mm tree. Its filename was lib-xz-replace-min_t-with-min.patch This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm ------------------------------------------------------ From: Thorsten Blum Subject: lib/xz: replace min_t with min Date: Tue, 9 Jun 2026 18:00:28 +0300 Use the simpler min() macro since the values are unsigned and compatible. Link: https://lore.kernel.org/20260609150030.634570-1-lasse.collin@tukaani.org Signed-off-by: Thorsten Blum Signed-off-by: Lasse Collin Reviewed-by: Lasse Collin Signed-off-by: Andrew Morton --- lib/xz/xz_dec_bcj.c | 2 +- lib/xz/xz_dec_lzma2.c | 11 +++++------ lib/xz/xz_dec_stream.c | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) --- a/lib/xz/xz_dec_bcj.c~lib-xz-replace-min_t-with-min +++ a/lib/xz/xz_dec_bcj.c @@ -466,7 +466,7 @@ static void bcj_flush(struct xz_dec_bcj { size_t copy_size; - copy_size = min_t(size_t, s->temp.filtered, b->out_size - b->out_pos); + copy_size = min(s->temp.filtered, b->out_size - b->out_pos); memcpy(b->out + b->out_pos, s->temp.buf, copy_size); b->out_pos += copy_size; --- a/lib/xz/xz_dec_lzma2.c~lib-xz-replace-min_t-with-min +++ a/lib/xz/xz_dec_lzma2.c @@ -354,7 +354,7 @@ static bool dict_repeat(struct dictionar if (dist >= dict->full || dist >= dict->size) return false; - left = min_t(size_t, dict->limit - dict->pos, *len); + left = min(dict->limit - dict->pos, *len); *len -= left; back = dict->pos - dist - 1; @@ -1098,9 +1098,8 @@ enum xz_ret xz_dec_lzma2_run(struct xz_d * the output buffer yet, we may run this loop * multiple times without changing s->lzma2.sequence. */ - dict_limit(&s->dict, min_t(size_t, - b->out_size - b->out_pos, - s->lzma2.uncompressed)); + dict_limit(&s->dict, min(b->out_size - b->out_pos, + s->lzma2.uncompressed)); if (!lzma2_lzma(s, b)) return XZ_DATA_ERROR; @@ -1260,8 +1259,8 @@ enum xz_ret xz_dec_microlzma_run(struct s->dict.end = b->out_size - b->out_pos; while (true) { - dict_limit(&s->dict, min_t(size_t, b->out_size - b->out_pos, - s->lzma2.uncompressed)); + dict_limit(&s->dict, min(b->out_size - b->out_pos, + s->lzma2.uncompressed)); if (!lzma2_lzma(s, b)) return XZ_DATA_ERROR; --- a/lib/xz/xz_dec_stream.c~lib-xz-replace-min_t-with-min +++ a/lib/xz/xz_dec_stream.c @@ -155,8 +155,8 @@ static const uint8_t check_sizes[16] = { */ static bool fill_temp(struct xz_dec *s, struct xz_buf *b) { - size_t copy_size = min_t(size_t, - b->in_size - b->in_pos, s->temp.size - s->temp.pos); + size_t copy_size = min(b->in_size - b->in_pos, + s->temp.size - s->temp.pos); memcpy(s->temp.buf + s->temp.pos, b->in + b->in_pos, copy_size); b->in_pos += copy_size; _ Patches currently in -mm which might be from thorsten.blum@linux.dev are