Merge branch 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebieder...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Feb 2018 01:04:06 +0000 (17:04 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 23 Feb 2018 01:04:06 +0000 (17:04 -0800)
commitbae6cfe8a3b980db8e11accecc6bdbb2ea314002
treeacbd8a0e58c669cf4dfc8997f8fc8ede03f3301f
parent0bb78166dfda3d4ff07dd4bd04caa6244a867927
parent9026e820cbd2ea39a06a129ecdddf2739bd3602b
Merge branch 'siginfo-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull siginfo fix from Eric Biederman:
 "This fixes a build error that only shows up on blackfin"

* 'siginfo-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  fs/signalfd: fix build error for BUS_MCEERR_AR