]> 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 07:34:05 +0000 (23:34 -0800)
committerChuck Anderson <chuck.anderson@oracle.com>
Thu, 9 Mar 2017 07:34:05 +0000 (23:34 -0800)
commit07d79b750262df0184aee55cc151315afb4a99c7
tree7aa44bad234474b5b5f8423cdd47cb67539d364d
parentc50999d80976e57eed973d84e1b6ee1bdef22539
parent9bce26c80ccde0dd80a7e57bc21519ed7311dbbb
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: fix crash on fsync when using overlayfs v4
  vfio/pci: Hide broken INTx support from user
  crypto: cryptd - Assign statesize properly
  crypto: ghash-clmulni - Fix load failure
  USB: digi_acceleport: do sanity checking for the number of ports
  ksplice: add sysctls for determining Ksplice features.
  signal: protect SIGNAL_UNKILLABLE from unintentional clearing.

Conflicts:
kernel/Makefile
kernel/sysctl.c
arch/Kconfig
arch/x86/crypto/ghash-clmulni-intel_glue.c
crypto/cryptd.c
drivers/vfio/pci/vfio_pci.c
fs/btrfs/file.c
include/linux/sched.h
kernel/Makefile
kernel/signal.c
kernel/sysctl.c