From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Fri, 20 Jan 2017 10:09:31 +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~21
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3ab14cc7087f454f32d6d604b60a06ab7ee68804;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:
  xfs: validate metadata LSNs against log on v5 superblocks
  IB/ipoib: move back IB LL address into the hard header
  net: preserve IP control block during GSO segmentation
  xfs: fix broken multi-fsb buffer logging
  xfs: Split default quota limits by quota type
---

3ab14cc7087f454f32d6d604b60a06ab7ee68804