From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Mon, 23 Jan 2017 22:28:05 +0000 (-0800)
Subject: Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux... 
X-Git-Tag: v4.1.12-92~11
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=85efe64dd5dab577408d96a9c831120e9c51d4bc;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:
  Don't feed anything but regular iovec's to blk_rq_map_user_iov
  crypto: algif_hash - Only export and import on sockets with data
---

85efe64dd5dab577408d96a9c831120e9c51d4bc