Merge tag 'v4.1.48' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-4.1-stable
[email protected] Thu, 21 Dec 2017 17:39:01 +0100
| Newsgroups | gmane.linux.ports.mips.cvs |
|---|---|
| Message-ID | <S23990430AbdLUQjDlqA7E/[email protected]> |
Author: Ralf Baechle <[email protected]> Thu Dec 21 14:22:57 2017 +0100 Commit: 55b08be52b62f7456e69a1c6bb2f5d052407b03d Gitweb: https://git.linux-mips.org/g/ralf/linux/55b08be52b62 Branch: linux-4.1-stable --- Makefile | 2 arch/arm/mm/dump.c | 4 - arch/arm/mm/init.c | 4 - arch/mips/bcm47xx/leds.c | 2 arch/mips/kernel/ptrace.c | 17 ++ arch/mips/kernel/setup.c | 74 --------- arch/mips/ralink/mt7620.c | 4 - arch/parisc/kernel/syscall.S | 6 - arch/powerpc/kernel/signal.c | 2 arch/s390/include/asm/asm-prototypes.h | 8 + arch/s390/kernel/dis.c | 5 - arch/s390/kernel/runtime_instr.c | 4 - arch/x86/include/asm/efi.h | 26 +++ arch/x86/kvm/svm.c | 9 + arch/x86/kvm/vmx.c | 4 + arch/x86/kvm/x86.c | 5 + arch/x86/lib/x86-opcode-map.txt | 2 arch/x86/mm/pageattr.c | 17 +- arch/x86/platform/efi/efi-bgrt.c | 39 ++--- arch/x86/platform/efi/efi.c | 39 ++--- arch/x86/platform/efi/efi_32.c | 5 + arch/x86/platform/efi/efi_64.c | 137 +++++++++++++---- arch/x86/platform/efi/efi_stub_64.S | 43 ----- drivers/ata/libata-eh.c | 2 drivers/clk/ti/clk-dra7-atl.c | 3 drivers/firmware/efi/efi.c | 32 ---- drivers/gpu/drm/armada/Makefile | 2 drivers/gpu/drm/i915/intel_i2c.c | 4 - drivers/gpu/drm/panel/panel-simple.c | 2 drivers/iio/light/cm3232.c | 2 drivers/infiniband/ulp/srp/ib_srp.c | 25 ++- drivers/infiniband/ulp/srpt/ib_srpt.c | 9 + drivers/md/bcache/alloc.c | 5 - drivers/md/bcache/extents.c | 2 drivers/md/bcache/journal.c | 2 drivers/md/dm-bufio.c | 15 +- drivers/md/dm.c | 12 +- drivers/media/rc/ir-lirc-codec.c | 9 + drivers/media/usb/as102/as102_fw.c | 28 ++-- drivers/media/usb/cx231xx/cx231xx-cards.c | 2 drivers/media/v4l2-core/v4l2-ctrls.c | 16 ++ drivers/misc/eeprom/at24.c | 6 + drivers/mmc/core/bus.c | 3 drivers/mtd/nand/nand_base.c | 9 + drivers/net/ethernet/3com/typhoon.c | 25 ++- drivers/net/ethernet/intel/e1000e/mac.c | 11 + drivers/net/ethernet/intel/e1000e/netdev.c | 4 - drivers/net/ethernet/intel/e1000e/phy.c | 7 + drivers/net/ethernet/intel/fm10k/fm10k_main.c | 2 drivers/net/ethernet/intel/i40e/i40e_main.c | 2 drivers/net/ethernet/intel/i40e/i40e_txrx.c | 2 drivers/net/ethernet/intel/i40evf/i40e_txrx.c | 2 drivers/net/ethernet/intel/igb/igb_main.c | 2 drivers/net/ethernet/intel/igbvf/netdev.c | 2 drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 drivers/net/wireless/ath/ath10k/mac.c | 7 + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 12 +- drivers/pci/probe.c | 15 ++ drivers/staging/iio/cdc/ad7150.c | 2 drivers/target/iscsi/iscsi_target.c | 8 + drivers/vhost/scsi.c | 5 - drivers/xen/xenbus/xenbus_dev_frontend.c | 2 fs/9p/vfs_inode.c | 3 fs/9p/vfs_inode_dotl.c | 3 fs/autofs4/waitq.c | 15 ++ fs/btrfs/extent-tree.c | 14 +- fs/ecryptfs/messaging.c | 7 + fs/ext4/extents.c | 6 + fs/isofs/isofs.h | 2 fs/isofs/rock.h | 2 fs/isofs/util.c | 2 fs/nfs/dir.c | 3 fs/nfs/nfs4proc.c | 18 +- fs/nfs/super.c | 2 fs/nfsd/nfs4state.c | 25 +++ fs/nilfs2/segment.c | 6 + include/linux/netlink.h | 2 include/net/genetlink.h | 2 include/trace/events/sunrpc.h | 17 +- include/uapi/linux/bcache.h | 2 kernel/sched/core.c | 3 mm/huge_memory.c | 14 +- mm/madvise.c | 4 - net/9p/client.c | 3 net/9p/trans_virtio.c | 13 +- net/ipv6/route.c | 6 + net/mac80211/ieee80211_i.h | 1 net/mac80211/mesh.c | 3 net/mac80211/mesh_plink.c | 14 +- net/mac80211/mesh_sync.c | 11 - net/netfilter/nf_tables_api.c | 2 net/netfilter/nft_queue.c | 2 net/netlink/af_netlink.c | 4 + net/netlink/genetlink.c | 16 ++ net/nfc/core.c | 2 net/rds/send.c | 11 + net/vmw_vsock/af_vsock.c | 167 +++++++++++---------- net/xfrm/xfrm_user.c | 25 ++- sound/core/pcm_lib.c | 6 + sound/core/timer_compat.c | 12 +- sound/pci/hda/hda_intel.c | 3 sound/pci/hda/patch_realtek.c | 2 sound/soc/codecs/wm_adsp.c | 25 +++ sound/soc/sh/rcar/core.c | 4 - sound/usb/clock.c | 9 + sound/usb/mixer.c | 15 ++ 107 files changed, 720 insertions(+), 550 deletions(-)