From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 3 Apr 2025 18:16:57 +0000 (-0700)
Subject: Merge tag 'mm-nonmm-stable-2025-04-02-22-12' of git://git.kernel.org/pub/scm/linux... 
X-Git-Tag: nvme-6.15-2025-04-10~24
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=5a2b5cb76cb4c3e878d25f92801df9e12a7b2037;p=nvme.git

Merge tag 'mm-nonmm-stable-2025-04-02-22-12' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Pull more non-MM updates from Andrew Morton:
 "One bugfix and a couple of small late-arriving updates"

* tag 'mm-nonmm-stable-2025-04-02-22-12' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
  lib: scatterlist: fix sg_split_phys to preserve original scatterlist offsets
  lib/sort.c: add _nonatomic() variants with cond_resched()
  mailmap: add an entry for Nicolas Schier
---

5a2b5cb76cb4c3e878d25f92801df9e12a7b2037