From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 11 Mar 2023 03:09:18 +0000 (-0800)
Subject: Merge tag 'pull-highmem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
X-Git-Tag: v6.6.17~5327
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d33d4c9e0888e9ee7666813b3f9ecc244a64d127;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'pull-highmem' of git://git./linux/kernel/git/viro/vfs

Pull put_and_unmap_page() helper from Al Viro:
 "kmap_local_page() conversions in local filesystems keep running into
  kunmap_local_page()+put_page() combinations.  We can keep inventing
  names for identical inline helpers, but it's getting rather
  inconvenient. I've added a trivial helper to linux/highmem.h instead.

  I would've held that back until the merge window, if not for the mess
  it causes in tree topology - I've several branches merging from that
  one, and it's only going to get worse if e.g. ext2 stuff gets picked
  by Jan"

* tag 'pull-highmem' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  new helper: put_and_unmap_page()
---

d33d4c9e0888e9ee7666813b3f9ecc244a64d127