From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 6 Mar 2018 20:41:30 +0000 (-0800)
Subject: Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder... 
X-Git-Tag: Ubuntu-5.10.0-12.13~8306
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=86f84779d8e92a690b2f281175ea06b884cb6fa4;p=mirror_ubuntu-hirsute-kernel.git

Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace

Pull sigingo fix from Eric Biederman:
 "The kbuild test robot found that I accidentally moved si_pkey when I
  was cleaning up siginfo_t. A short followed by an int with the int
  having 8 byte alignment. Sheesh siginfo_t is a weird structure.

  I have now corrected it and added build time checks that with a little
  luck will catch any similar future mistakes. The build time checks
  were sufficient for me to verify the bug and to verify my fix. So they
  are at least useful this once."

* 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  signal/x86: Include the field offsets in the build time checks
  signal: Correct the offset of si_pkey in struct siginfo
---

86f84779d8e92a690b2f281175ea06b884cb6fa4