From: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Date: Fri, 18 Dec 2015 02:47:33 +0000 (-0800)
Subject: Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com... 
X-Git-Tag: v4.1.12-92~210
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=1bb4624c6dae07e97c08b88afcd7ae8af09a403b;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek into uek/uek-4.1

* 'topic/uek-4.1/upstream-cherry-picks' of git://ca-git.us.oracle.com/linux-uek:
  KEYS: Fix crash when attempt to garbage collect an uninstantiated keyring
  KEYS: Fix race between key destruction and finding a keyring by name
---

1bb4624c6dae07e97c08b88afcd7ae8af09a403b