]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Mon, 23 Jan 2017 22:28:05 +0000 (14:28 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Mon, 23 Jan 2017 22:28:05 +0000 (14:28 -0800)
* 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

1  2 
crypto/algif_hash.c

Simple merge