]> www.infradead.org Git - users/jedix/linux-maple.git/commit
Merge branch topic/uek-4.1/upstream-cherry-picks of git://ca-git.us.oracle.com/linux...
authorChuck Anderson <chuck.anderson@oracle.com>
Thu, 9 Mar 2017 04:00:03 +0000 (20:00 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 9 Mar 2017 04:00:03 +0000 (20:00 -0800)
commit3d8033f4ad8b58894a4ac5318308a5c7c5a9c00e
treedb3966bcc0a5fc5037b7a6aa724332db76cde125
parent0fb11a90780833772981103ded8d40afce2aa3d5
parent0f5f215d74bafe2271fa6dbbf2dc32dee57eb9b3
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: (280 commits)
  dm btree: fix bufio buffer leaks in dm_btree_del() error path
  ipv4: keep skb->dst around in presence of IP options
  ip6_gre: fix ip6gre_err() invalid reads
  watchdog: hpwdt: changed maintainer information
  watchdog: hpwdt: add support for iLO5
  watchdog: hpwdt: remove email address from doc
  watchdog: hpwdt: Adjust documentation to match latest kernel module parameters.
  hpwdt: use nmi_panic() when kernel panics in NMI handler
  panic: change nmi_panic from macro to function
  watchdog/hpwdt: Fix build on certain configs
  watchdog/hpwdt: Create stack frame in asminline_call()
  x86/asm: Add C versions of frame pointer macros
  x86/asm: Clean up frame pointer macros
  watchdog: hpwdt: HP rebranding
  panic, x86: Allow CPUs to save registers even if looping in NMI context
  watchdog: hpwdt: Add support for WDIOC_SETOPTIONS
  kvm: fix page struct leak in handle_vmon
  bnx2: use READ_ONCE() instead of barrier()
  bnx2: Wait for in-flight DMA to complete at probe stage
  bnx2: fix locking when netconsole is used
  ...
49 files changed:
Documentation/kernel-parameters.txt
MAINTAINERS
arch/x86/Kconfig
arch/x86/include/asm/mce.h
arch/x86/include/uapi/asm/msr-index.h
arch/x86/kernel/cpu/mcheck/mce.c
arch/x86/kernel/cpu/mcheck/mce_intel.c
arch/x86/kernel/nmi.c
arch/x86/kernel/reboot.c
arch/x86/kvm/vmx.c
crypto/ablkcipher.c
crypto/ahash.c
crypto/blkcipher.c
crypto/cryptd.c
crypto/gcm.c
crypto/scatterwalk.c
crypto/testmgr.c
drivers/crypto/qat/qat_common/qat_algs.c
drivers/infiniband/ulp/ipoib/ipoib_main.c
drivers/md/persistent-data/dm-btree.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sp.h
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c
drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.h
drivers/net/ethernet/intel/fm10k/fm10k_main.c
drivers/net/hyperv/netvsc_drv.c
fs/binfmt_elf.c
fs/coredump.c
fs/nfs/nfs4state.c
fs/ocfs2/acl.c
fs/posix_acl.c
include/linux/filter.h
include/linux/mm.h
kernel/panic.c
mm/memblock.c
mm/memcontrol.c
mm/memory_hotplug.c
mm/mempolicy.c
mm/nobootmem.c
mm/page_alloc.c
mm/vmscan.c
net/core/filter.c
net/ipv4/ip_sockglue.c
net/ipv4/tcp_ipv4.c
net/ipv6/ip6_gre.c
net/ipv6/tcp_ipv6.c