From: Chuck Anderson <chuck.anderson@oracle.com>
Date: Mon, 31 Oct 2016 10:48:30 +0000 (-0700)
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~50
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8ae162a4ff1249cd85e41883ebb4c5759d86ab61;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:
  btrfs: Handle unaligned length in extent_same
  panic, x86: Fix re-entrance problem due to panic on NMI
  kernel/watchdog.c: perform all-CPU backtrace in case of hard lockup
  Fix compilation error introduced by "cancel the setfilesize transation when io error happen"
  cancel the setfilesize transation when io error happen
  mm/hugetlb: optimize minimum size (min_size) accounting
  Btrfs: fix device replace of a missing RAID 5/6 device
  Btrfs: add RAID 5/6 BTRFS_RBIO_REBUILD_MISSING operation
  bpf: fix double-fdput in replace_map_fd_with_map_ptr()
---

8ae162a4ff1249cd85e41883ebb4c5759d86ab61