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

* 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

diff --cc drivers/infiniband/ulp/ipoib/ipoib.h
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_cm.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_ib.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_main.c
Simple merge

diff --cc drivers/infiniband/ulp/ipoib/ipoib_multicast.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_data.c
Simple merge

diff --cc fs/xfs/libxfs/xfs_dir2_node.c
Simple merge

diff --cc fs/xfs/xfs_log_recover.c
Simple merge

diff --cc include/linux/skbuff.h
Simple merge

diff --cc net/core/dev.c
Simple merge

diff --cc net/ipv4/ip_output.c
Simple merge

diff --cc net/openvswitch/datapath.c
Simple merge