From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 21 Oct 2022 21:33:36 +0000 (-0700)
Subject: Merge tag 'selinux-pr-20221020' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: dma-mapping-6.2-2022-12-13~73
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0de0b76837c2e958ad0e8fa9abd9846843fbf3f8;p=users%2Fhch%2Fdma-mapping.git

Merge tag 'selinux-pr-20221020' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux

Pull selinux fix from Paul Moore:
 "A small SELinux fix for a GFP_KERNEL allocation while a spinlock is
  held.

  The patch, while still fairly small, is a bit larger than one might
  expect from a simple s/GFP_KERNEL/GFP_ATOMIC/ conversion because we
  added support for the function to be called with different gfp flags
  depending on the context, preserving GFP_KERNEL for those cases that
  can safely sleep"

* tag 'selinux-pr-20221020' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
  selinux: enable use of both GFP_KERNEL and GFP_ATOMIC in convert_context()
---

0de0b76837c2e958ad0e8fa9abd9846843fbf3f8