From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Sep 2017 03:07:18 +0000 (-1000)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm... 
X-Git-Tag: v4.14-rc2~36
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=b8350cd00407a121e10727d9591026d6194714b7;p=sfrench%2Fcifs-2.6.git

Merge branch 'for-linus' of git://git./linux/kernel/git/ebiederm/user-namespace

Pull si_code fix from Eric Biederman:
 "When sorting out the si_code ambiguity fcntl I accidentally overshot
  and included SIGPOLL as well. Ooops! This is my trivial fix for that.

  Vince Weaver caught this when it landed in your tree with his
  perf_event_tests many of which started failing because the si_code
  changed"

Quoth Vince Weaver:
 "I've tested with this patch applied and can confirm all of my tests
  now pass again"

Fixes: d08477aa975e ("fcntl: Don't use ambiguous SIG_POLL si_codes")

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  fcntl: Don't set si_code to SI_SIGIO when sig == SIGPOLL
---

b8350cd00407a121e10727d9591026d6194714b7