Skip to contentSkip to conversation

Linux 4.4.177

DISCUSSION Greg KH 1 participant 2 messages Mar 24, 2019 Stable branch

lore
Share & tools
lore

Greg KH

author maintainer
#0 lore raw

I'm announcing the release of the 4.4.177 kernel.

All users of the 4.4 kernel series must upgrade.

The updated 4.4.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-4.4.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary

thanks,

greg k-h

------------

 Makefile                                                   |    2 
 arch/arc/include/asm/bitops.h                              |    6 
 arch/arc/include/asm/uaccess.h                             |    8 
 arch/arc/kernel/head.S                                     |   10 
 arch/arm/Kconfig                                           |    1 
 arch/arm/boot/dts/exynos3250.dtsi                          |    3 
 arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi          |   25 
 arch/arm/boot/dts/exynos5420.dtsi                          |   10 
 arch/arm/include/asm/irq.h                                 |    1 
 arch/arm/kernel/irq.c                                      |   62 --
 arch/arm/kernel/smp.c                                      |    2 
 arch/arm/kvm/mmio.c                                        |   10 
 arch/arm/mach-omap2/display.c                              |    7 
 arch/arm/mach-s3c24xx/mach-osiris-dvs.c                    |    8 
 arch/arm/plat-pxa/ssp.c                                    |    3 
 arch/arm64/crypto/aes-ce-ccm-core.S                        |    5 
 arch/arm64/kernel/head.S                                   |    3 
 arch/m68k/Makefile                                         |    5 
 arch/mips/configs/ath79_defconfig                          |    1 
 arch/mips/jazz/jazzdma.c                                   |    5 
 arch/mips/kernel/irq.c                                     |    4 
 arch/mips/kernel/process.c                                 |    7 
 arch/powerpc/include/asm/epapr_hcalls.h                    |   12 
 arch/powerpc/kernel/entry_32.S                             |    9 
 arch/powerpc/platforms/83xx/suspend-asm.S                  |   34 +
 arch/powerpc/platforms/embedded6xx/wii.c                   |    4 
 arch/powerpc/platforms/powernv/opal-msglog.c               |    2 
 arch/x86/include/asm/page_64_types.h                       |    4 
 arch/x86/include/asm/uaccess.h                             |    7 
 arch/x86/include/asm/uv/bios.h                             |    8 
 arch/x86/kernel/cpu/amd.c                                  |    8 
 arch/x86/kernel/kexec-bzimage64.c                          |    3 
 arch/x86/kvm/svm.c                                         |    8 
 arch/x86/kvm/vmx.c                                         |   17 
 arch/x86/kvm/x86.c                                         |    1 
 arch/x86/platform/uv/bios_uv.c                             |   23 
 arch/xtensa/configs/smp_lx200_defconfig                    |    1 
 arch/xtensa/kernel/head.S                                  |    5 
 arch/xtensa/kernel/smp.c                                   |   41 +
 arch/xtensa/kernel/time.c                                  |    2 
 crypto/ahash.c                                             |   14 
 crypto/pcbc.c                                              |   14 
 drivers/acpi/device_sysfs.c                                |    6 
 drivers/atm/he.c                                           |    2 
 drivers/base/power/wakeup.c                                |    8 
 drivers/char/applicom.c                                    |   35 -
 drivers/clk/ingenic/cgu.c                                  |   10 
 drivers/clocksource/exynos_mct.c                           |   23 
 drivers/cpufreq/cpufreq.c                                  |    6 
 drivers/cpufreq/cpufreq_governor.h                         |   10 
 drivers/cpufreq/intel_pstate.c                             |   14 
 drivers/cpufreq/pxa2xx-cpufreq.c                           |    4 
 drivers/cpufreq/tegra124-cpufreq.c                         |    2 
 drivers/crypto/caam/caamalg.c                              |    1 
 drivers/dma/at_xdmac.c                                     |   19 
 drivers/dma/dmatest.c                                      |   28 -
 drivers/dma/sh/usb-dmac.c                                  |    2 
 drivers/firmware/efi/runtime-wrappers.c                    |    7 
 drivers/firmware/iscsi_ibft.c                              |    1 
 drivers/gpio/gpio-vf610.c                                  |    5 
 drivers/gpu/drm/msm/msm_rd.c                               |    7 
 drivers/gpu/drm/radeon/evergreen_cs.c                      |    1 
 drivers/gpu/ipu-v3/ipu-common.c                            |    8 
 drivers/hwtracing/intel_th/gth.c                           |    4 
 drivers/hwtracing/stm/core.c                               |   11 
 drivers/i2c/busses/i2c-cadence.c                           |    9 
 drivers/i2c/busses/i2c-tegra.c                             |    2 
 drivers/infiniband/hw/qib/qib_ud.c                         |    1 
 drivers/infiniband/ulp/srp/ib_srp.c                        |   10 
 drivers/input/keyboard/matrix_keypad.c                     |    2 
 drivers/input/keyboard/st-keyscan.c                        |    4 
 drivers/input/mouse/elan_i2c_core.c                        |    1 
 drivers/input/tablet/wacom_serial4.c                       |    2 
 drivers/iommu/amd_iommu.c                                  |   15 
 drivers/irqchip/irq-mmp.c                                  |    6 
 drivers/isdn/hardware/avm/b1.c                             |    2 
 drivers/isdn/i4l/isdn_tty.c                                |    8 
 drivers/leds/leds-lp5523.c                                 |    4 
 drivers/md/raid10.c                                        |    3 
 drivers/md/raid5.c                                         |    2 
 drivers/media/usb/uvc/uvc_driver.c                         |   14 
 drivers/media/usb/uvc/uvc_video.c                          |    8 
 drivers/media/v4l2-core/videobuf2-v4l2.c                   |    1 
 drivers/mfd/ab8500-core.c                                  |    2 
 drivers/mfd/db8500-prcmu.c                                 |    4 
 drivers/mfd/mc13xxx-core.c                                 |    4 
 drivers/mfd/qcom_rpm.c                                     |    4 
 drivers/mfd/ti_am335x_tscadc.c                             |    5 
 drivers/mfd/twl-core.c                                     |    4 
 drivers/mfd/wm5110-tables.c                                |    2 
 drivers/mmc/host/mmc_spi.c                                 |    1 
 drivers/net/dsa/mv88e6xxx.c                                |    2 
 drivers/net/ethernet/altera/altera_msgdma.c                |    3 
 drivers/net/ethernet/altera/altera_tse_main.c              |    4 
 drivers/net/ethernet/atheros/atlx/atl2.c                   |    4 
 drivers/net/ethernet/broadcom/bcmsysport.c                 |    4 
 drivers/net/ethernet/broadcom/bnxt/bnxt.c                  |    6 
 drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c          |    6 
 drivers/net/ethernet/hisilicon/hns_mdio.c                  |    2 
 drivers/net/ethernet/ibm/ibmveth.c                         |    2 
 drivers/net/ethernet/marvell/mv643xx_eth.c                 |    7 
 drivers/net/ethernet/marvell/sky2.c                        |   24 
 drivers/net/ethernet/mellanox/mlx4/cmd.c                   |    1 
 drivers/net/ethernet/mellanox/mlx4/en_rx.c                 |   23 
 drivers/net/ethernet/mellanox/mlx4/resource_tracker.c      |    6 
 drivers/net/ethernet/renesas/ravb_main.c                   |    2 
 drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c             |    4 
 drivers/net/ipvlan/ipvlan_main.c                           |    9 
 drivers/net/phy/mdio_bus.c                                 |    1 
 drivers/net/phy/micrel.c                                   |   14 
 drivers/net/ppp/pptp.c                                     |    1 
 drivers/net/team/team.c                                    |   27 -
 drivers/net/team/team_mode_loadbalance.c                   |   15 
 drivers/net/vxlan.c                                        |   13 
 drivers/net/wireless/mac80211_hwsim.c                      |    2 
 drivers/net/xen-netback/netback.c                          |   10 
 drivers/parport/parport_pc.c                               |    2 
 drivers/pinctrl/meson/pinctrl-meson8b.c                    |    2 
 drivers/platform/x86/Kconfig                               |    1 
 drivers/regulator/s2mpa01.c                                |   10 
 drivers/regulator/s2mps11.c                                |    6 
 drivers/s390/block/dasd_eckd.c                             |    8 
 drivers/s390/net/qeth_core_main.c                          |   15 
 drivers/s390/virtio/virtio_ccw.c                           |    4 
 drivers/scsi/csiostor/csio_attr.c                          |    2 
 drivers/scsi/isci/init.c                                   |   14 
 drivers/scsi/libfc/fc_lport.c                              |    6 
 drivers/scsi/libiscsi.c                                    |    6 
 drivers/scsi/libsas/sas_expander.c                         |    2 
 drivers/scsi/qla4xxx/ql4_os.c                              |    2 
 drivers/scsi/virtio_scsi.c                                 |    2 
 drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c        |    9 
 drivers/staging/lustre/lnet/lnet/config.c                  |   14 
 drivers/staging/lustre/lnet/selftest/conrpc.c              |    4 
 drivers/staging/lustre/lnet/selftest/console.c             |    6 
 drivers/staging/lustre/lustre/include/lustre_disk.h        |    1 
 drivers/staging/lustre/lustre/libcfs/debug.c               |    6 
 drivers/staging/lustre/lustre/libcfs/hash.c                |    3 
 drivers/staging/lustre/lustre/libcfs/workitem.c            |    4 
 drivers/staging/lustre/lustre/llite/dir.c                  |    2 
 drivers/staging/lustre/lustre/lov/lov_pool.c               |    3 
 drivers/staging/lustre/lustre/obdclass/obd_mount.c         |   10 
 drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c             |    1 
 drivers/staging/lustre/lustre/ptlrpc/sec_config.c          |    3 
 drivers/staging/rdma/hfi1/ud.c                             |    1 
 drivers/target/iscsi/iscsi_target.c                        |    4 
 drivers/thermal/int340x_thermal/processor_thermal_device.c |    2 
 drivers/tty/serial/8250/8250_pci.c                         |  141 ++++-
 drivers/tty/serial/fsl_lpuart.c                            |    2 
 drivers/usb/dwc3/gadget.c                                  |    1 
 drivers/usb/gadget/function/f_sourcesink.c                 |    2 
 drivers/usb/serial/cp210x.c                                |    1 
 drivers/usb/serial/ftdi_sio.c                              |    2 
 drivers/usb/serial/ftdi_sio_ids.h                          |    6 
 drivers/usb/serial/option.c                                |    2 
 fs/9p/cache.c                                              |    8 
 fs/9p/v9fs.h                                               |    2 
 fs/9p/v9fs_vfs.h                                           |   23 
 fs/9p/vfs_file.c                                           |    6 
 fs/9p/vfs_inode.c                                          |   25 
 fs/9p/vfs_inode_dotl.c                                     |   27 -
 fs/9p/vfs_super.c                                          |    4 
 fs/autofs4/expire.c                                        |    3 
 fs/autofs4/inode.c                                         |    4 
 fs/btrfs/extent_io.c                                       |    4 
 fs/btrfs/volumes.c                                         |    4 
 fs/ceph/snap.c                                             |    3 
 fs/cifs/file.c                                             |   12 
 fs/cifs/smb2pdu.h                                          |    4 
 fs/drop_caches.c                                           |    8 
 fs/ext2/super.c                                            |   39 -
 fs/ext4/resize.c                                           |    3 
 fs/hugetlbfs/inode.c                                       |   12 
 fs/jbd2/transaction.c                                      |   33 -
 fs/ncpfs/ioctl.c                                           |    4 
 fs/nfs/direct.c                                            |   15 
 fs/nfs/filelayout/filelayout.c                             |   17 
 fs/nfs/flexfilelayout/flexfilelayout.c                     |   25 
 fs/nfs/pagelist.c                                          |   12 
 fs/nfs/pnfs.c                                              |   24 
 fs/nfs/read.c                                              |    2 
 fs/nfs/super.c                                             |    5 
 fs/nfsd/nfs3proc.c                                         |   16 
 fs/nfsd/nfs3xdr.c                                          |    1 
 fs/nfsd/nfsctl.c                                           |    2 
 include/keys/user-type.h                                   |    2 
 include/linux/cpufreq.h                                    |   12 
 include/linux/device-mapper.h                              |    2 
 include/net/gro_cells.h                                    |   12 
 include/net/icmp.h                                         |    9 
 include/net/ip.h                                           |    2 
 include/net/phonet/pep.h                                   |    5 
 kernel/futex.c                                             |    7 
 kernel/locking/rtmutex.c                                   |   52 +-
 kernel/locking/rtmutex_common.h                            |    8 
 kernel/rcu/tree.c                                          |   20 
 kernel/sysctl.c                                            |   11 
 kernel/trace/trace.c                                       |    1 
 lib/assoc_array.c                                          |    8 
 mm/hugetlb.c                                               |   14 
 mm/memory_hotplug.c                                        |    6 
 mm/mempolicy.c                                             |    6 
 mm/migrate.c                                               |   11 
 mm/mmap.c                                                  |    7 
 mm/shmem.c                                                 |   12 
 mm/vmalloc.c                                               |    2 
 net/9p/client.c                                            |    2 
 net/batman-adv/soft-interface.c                            |    2 
 net/bridge/br_multicast.c                                  |    9 
 net/bridge/netfilter/ebtables.c                            |    4 
 net/ceph/messenger.c                                       |   12 
 net/core/net-sysfs.c                                       |    3 
 net/hsr/hsr_device.c                                       |   18 
 net/hsr/hsr_framereg.c                                     |   12 
 net/hsr/hsr_framereg.h                                     |    1 
 net/ipv4/cipso_ipv4.c                                      |   23 
 net/ipv4/icmp.c                                            |    7 
 net/ipv4/inet_connection_sock.c                            |    2 
 net/ipv4/ip_options.c                                      |   22 
 net/ipv4/ip_vti.c                                          |   50 +
 net/ipv4/netfilter/arp_tables.c                            |    2 
 net/ipv4/netfilter/ip_tables.c                             |    2 
 net/ipv4/route.c                                           |    4 
 net/ipv4/syncookies.c                                      |    7 
 net/ipv4/tcp_input.c                                       |    8 
 net/ipv4/udp.c                                             |    2 
 net/ipv4/udp_impl.h                                        |    2 
 net/ipv4/udplite.c                                         |    2 
 net/ipv6/ip6mr.c                                           |    8 
 net/ipv6/netfilter/ip6_tables.c                            |    2 
 net/ipv6/route.c                                           |    2 
 net/ipv6/sit.c                                             |    7 
 net/ipv6/udp.c                                             |    2 
 net/ipv6/udp_impl.h                                        |    2 
 net/ipv6/udplite.c                                         |    2 
 net/l2tp/l2tp_ip6.c                                        |    4 
 net/mac80211/cfg.c                                         |    4 
 net/mac80211/rx.c                                          |    4 
 net/netfilter/ipvs/ip_vs_ctl.c                             |   12 
 net/netfilter/nf_conntrack_proto_tcp.c                     |    4 
 net/netfilter/nfnetlink_acct.c                             |    3 
 net/netfilter/nfnetlink_log.c                              |    2 
 net/nfc/llcp_commands.c                                    |   20 
 net/nfc/llcp_core.c                                        |   24 
 net/packet/af_packet.c                                     |    2 
 net/phonet/pep.c                                           |   32 -
 net/socket.c                                               |   24 
 net/unix/af_unix.c                                         |   48 +
 net/unix/diag.c                                            |    3 
 net/wireless/reg.c                                         |    4 
 net/x25/af_x25.c                                           |   20 
 security/keys/key.c                                        |    4 
 security/keys/keyring.c                                    |    4 
 security/keys/proc.c                                       |   11 
 security/keys/request_key.c                                |    1 
 security/keys/request_key_auth.c                           |    2 
 security/lsm_audit.c                                       |   10 
 sound/core/compress_offload.c                              |    3 
 sound/firewire/bebob/bebob.c                               |   14 
 sound/soc/fsl/fsl_esai.c                                   |    7 
 sound/soc/fsl/imx-audmux.c                                 |   24 
 sound/soc/intel/boards/broadwell.c                         |    2 
 sound/soc/intel/boards/haswell.c                           |    2 
 sound/soc/soc-dapm.c                                       |   10 
 sound/soc/soc-topology.c                                   |    8 
 tools/arch/x86/include/asm/cpufeatures.h                   |  336 +++++++++++++
 tools/arch/x86/include/asm/disabled-features.h             |   65 ++
 tools/arch/x86/include/asm/required-features.h             |  106 ++++
 tools/arch/x86/lib/memcpy_64.S                             |  179 ++++++
 tools/arch/x86/lib/memset_64.S                             |  138 +++++
 tools/include/asm/alternative-asm.h                        |    9 
 tools/perf/MANIFEST                                        |    8 
 tools/perf/Makefile.perf                                   |   15 
 tools/perf/bench/mem-memcpy-x86-64-asm.S                   |    2 
 tools/perf/bench/mem-memset-x86-64-asm.S                   |    2 
 tools/perf/util/auxtrace.c                                 |    4 
 tools/perf/util/auxtrace.h                                 |    3 
 tools/perf/util/cpumap.c                                   |   11 
 tools/perf/util/include/asm/alternative-asm.h              |    9 
 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c        |   37 +
 tools/perf/util/symbol-elf.c                               |    9 
 virt/kvm/arm/vgic.c                                        |    7 
 282 files changed, 2469 insertions(+), 803 deletions(-)

Aditya Pakki (1):
md: Fix failed allocation of md_register_thread

Adrian Hunter (3):
perf intel-pt: Fix CYC timestamp calculation after OVF perf auxtrace: Define auxtrace record alignment perf intel-pt: Fix overlap calculation for padding

Al Viro (1):

      missing barriers in some of unix_sock ->addr and ->path accesses

Alban Bedel (1):
MIPS: ath79: Enable OF serial ports in the default config

Alexander Shishkin (2):
stm class: Prevent division by zero
intel_th: Don't reference unassigned outputs

Alexander Shiyan (1):
gpu: ipu-v3: Fix i.MX51 CSI control registers offset

Alexey Khoroshilov (2):
net: stmmac: dwmac-rk: fix error handling in rk_gmac_powerup()
net: mv643xx_eth: disable clk on error path in mv643xx_eth_shared_probe()

Alistair Strachan (1):
media: uvcvideo: Fix 'type' check leading to overflow

Andreas Gruenbacher (1):
sockfs: getxattr: Fail with -EOPNOTSUPP for invalid attribute names

Andrew Lunn (2):
net: dsa: mv88e6xxx: Fix u64 statistics
gpio: vf610: Mask all GPIO interrupts

Andy Lutomirski (1):
x86/uaccess: Don't leak the AC flag into __put_user() value evaluation

Andy Shevchenko (2):
dmaengine: dmatest: Abort test in case of mapping error ACPI / device_sysfs: Avoid OF modalias creation for removed device

Anoob Soman (1):
scsi: libiscsi: Fix race between iscsi_xmit_task and iscsi_complete_task

Ard Biesheuvel (1):
crypto: arm64/aes-ccm - fix logical bug in AAD MAC handling

Arnaldo Carvalho de Melo (1):
perf bench: Copy kernel files needed to build mem{cpy,set} x86_64 benchmarks

Arnd Bergmann (2):
phonet: fix building with clang
cpufreq: pxa2xx: remove incorrect __init annotation

Atsushi Nemoto (1):
net: altera_tse: fix connect_local_phy error path

Balaji Pothunoori (1):
mac80211: don't initiate TDLS connection if station is not associated to AP

Bard liao (1):
ASoC: topology: free created components in tplg load error

Bart Van Assche (2):
RDMA/srp: Rework SCSI device reset handling
scsi: target/iscsi: Avoid iscsit_release_commands_from_conn() deadlock

Bob Copeland (1):
mac80211: fix miscounting of ttl-dropped frames

Brian Welty (1):
IB/{hfi1, qib}: Fix WC.byte_len calculation for UD_SEND_WITH_IMM

Chaitanya Tata (1):
cfg80211: extend range deviation for DMG

Charles Keepax (1):
mfd: wm5110: Add missing ASRC rate register

Christoffer Dall (1):
KVM: arm/arm64: Fix MMIO emulation data handling

Christophe Leroy (3):
powerpc/32: Clear on-stack exception marker upon exception return powerpc/wii: properly disable use of BATs when requested. powerpc/83xx: Also save/restore SPRG4-7 during suspend

Codrin Ciubotariu (1):
dmaengine: at_xdmac: Fix wrongfull report of a channel as in use

Colin Ian King (1):
atm: he: fix sign-extension overflow on large shift

Cong Wang (1):
team: avoid complex list operations in team_nl_cmd_options_set()

Dan Carpenter (4):
mfd: ab8500-core: Return zero in get_register_interruptible()
ALSA: compress: prevent potential divide by zero bugs
thermal: int340x_thermal: Fix a NULL vs IS_ERR() check
usb: gadget: Potential NULL dereference on allocation error

Daniel Borkmann (1):
ipvlan: disallow userns cap_net_admin to change global mode/flags

Daniele Palmas (1):
USB: serial: option: add Telit ME910 ECM composition

Darrick J. Wong (2):
tmpfs: fix link accounting when a tmpfile is linked in
tmpfs: fix uninitialized return value in shmem_link

David Howells (1):
assoc_array: Fix shortcut creation

Dietmar Eggemann (1):
ARM: 8824/1: fix a migrating irq bug when hotplug cpu

Dmitry Eremin (1):
staging: lustre: fix buffer overflow of string buffer

Dmitry Torokhov (1):
Input: matrix_keypad - use flush_delayed_work()

Eric Biggers (6):
KEYS: allow reaching the keys quotas exactly
KEYS: user: Align the payload buffer
KEYS: always initialize keyring_index_key::desc_len
KEYS: restrict /proc/keys by credentials at open time
crypto: ahash - fix another early termination in hash walk
crypto: pcbc - remove bogus memcpy()s with src == dest

Eric Dumazet (10):
batman-adv: fix uninit-value in batadv_interface_tx()
udplite: call proper backlog handlers
l2tp: fix infoleak in l2tp_ip6_recvmsg()
net/x25: fix use-after-free in x25_device_event() net/x25: reset state in x25_connect()
net/x25: fix a race in x25_bind()
vxlan: test dev->flags & IFF_UP before calling gro_cells_receive() net/hsr: fix possible crash in add_timer()
gro_cells: make sure device is up in gro_cells_receive() tcp/dccp: remove reqsk_put() from inet_child_forget()

Eugeniy Paltsev (2):
ARCv2: Enable unaligned access in early ASM code
ARC: fix __ffs return value to avoid build warnings

Felipe Franciosi (1):
scsi: virtio_scsi: don't send sc payload with tmfs

Filipe Manana (1):
Btrfs: fix corruption reading shared and compressed extents after hole punching

Finn Thain (1):
m68k: Add -ffreestanding to CFLAGS

Florian Fainelli (1):
net: systemport: Fix reception of BPDUs

Gabriel Fernandez (1):
Input: st-keyscan - fix potential zalloc NULL dereference

Greg Kroah-Hartman (3):
ncpfs: fix build warning of strncpy
isdn: isdn_tty: fix build warning of strncpy Linux 4.4.177

Guillaume Nault (1):
tcp: handle inet_csk_reqsk_queue_add() failures

Gustavo A. R. Silva (4):
applicom: Fix potential Spectre v1 vulnerabilities
iscsi_ibft: Fix missing break in switch statement
ARM: s3c24xx: Fix boolean expressions in osiris_dvs_notify drm/radeon/evergreen_cs: fix missing break in switch statement

Halil Pasic (1):
s390/virtio: handle find on invalid queue gracefully

Hangbin Liu (2):
sit: check if IPv6 enabled before calling ip6_err_gen_icmpv6_unreach() Revert "bridge: do not add port to router list when receives query with source 0.0.0.0"

Hans Verkuil (1):
media: videobuf2-v4l2: drop WARN_ON in vb2_warn_zero_bytesused()

Hou Tao (1):

      9p: use inode->i_lock to protect i_size_write() under 32-bit

Ian Kent (1):
autofs: fix error return in autofs_fill_super()

Ido Schimmel (2):
team: Free BPF filter when unregistering netdev
ip6mr: Do not call __IP6_INC_STATS() from preemptible context

Igor Druzhinin (1):
xen-netback: fix occasional leak of grant ref mappings under memory pressure

Ilya Dryomov (1):
libceph: handle an empty authorize reply

Ivan Mironov (1):

      USB: serial: cp210x: add ID for Ingenico 3070

Jack Morgenstein (2):
net/mlx4_core: Fix reset flow when in command polling mode net/mlx4_core: Fix qp mtt size calculation

Jan Kara (3):
fs/drop_caches.c: avoid softlockups in drop_pagecache_sb()
ext4: fix crash during online resizing
ext2: Fix underflow in ext2_max_size()

Jann Horn (1):
mm: enforce min addr even if capable() in expand_downwards()

Jason Gerecke (1):
Input: wacom_serial4 - add support for Wacom ArtPad II tablet

Jay Dolan (2):
serial: 8250_pci: Fix number of ports for ACCES serial cards
serial: 8250_pci: Have ACCES cards that use the four port Pericom PI7C9X7954 chip use the pci_pericom_setup()

Jia-Ju Bai (1):
isdn: i4l: isdn_tty: Fix some concurrency double-free bugs

Jiaxun Yang (1):
x86/CPU/AMD: Set the CPB bit unconditionally on F17h

Jiri Olsa (1):
perf symbols: Filter out hidden symbols from labels

Johannes Thumshirn (1):
btrfs: ensure that a DUP or RAID1 block group has exactly two stripes

John Garry (1):
scsi: libsas: Fix rphy phy_identifier for PHYs with end devices attached

Jonathan Marek (1):
mfd: qcom_rpm: write fw_version to CTRL_REG

Jonathan Neuschäfer (1):
mmc: spi: Fix card detection during probe

Jordan Niethe (1):
powerpc/powernv: Make opal log only readable by root

Jozsef Kadlecsik (1):
netfilter: nf_conntrack_tcp: Fix stack out of bounds when parsing TCP options

Julian Wiedmann (1):
s390/qeth: fix use-after-free in error path

Jun-Ru Chang (1):
MIPS: Remove function size check in get_frame_info()

Kai-Heng Feng (1):
sky2: Disable MSI on Dell Inspiron 1545 and Gateway P-79

Kairui Song (1):
x86/kexec: Don't setup EFI info if EFI runtime is not enabled

Kal Conley (1):
net/packet: fix 4gb buffer limit due to overflow check

Kalash Nainwal (1):
net: Set rtm_table to RT_TABLE_COMPAT for ipv6 for tables > 255

Kangjie Lu (2):
mfd: mc13xxx: Fix a missing check of a register-read failure
leds: lp5523: fix a missing check of return value of lp55xx_read

Ken-ichirou MATSUZAWA (1):
netfilter: nfnetlink_log: just returns error for unknown command

Kristian H. Kristensen (1):
drm/msm: Unblock writer if reader closes file

Krzysztof Kozlowski (2):
ARM: dts: exynos: Do not ignore real-world fuse values for thermal zone 0 on Exynos5420
regulator: s2mps11: Fix steps for buck7, buck8 and LDO35

Li RongQing (1):
mac80211_hwsim: propagate genlmsg_reply return code

Liu Xiang (1):
MIPS: irq: Allocate accurate order pages for irq stack

Logan Gunthorpe (1):
scsi: isci: initialize shost fully before calling scsi_add_host()

Lubomir Rintel (1):
irqchip/mmp: Only touch the PJ4 IRQ & FIQ bits on enable/disable

Mans Rullgard (1):
USB: serial: ftdi_sio: add ID for Hjelmslund Electronics USB485

Mao Wenan (2):
net: hsr: fix memory leak in hsr_dev_finalize()
net: set static variable an initial value in atl2_probe()

Marc Zyngier (1):
arm/arm64: KVM: Feed initialized memory to MMIO accesses

Marek Szyprowski (1):
ARM: dts: exynos: Add minimal clkout parameters to Exynos3250 PMU

Martin Blumenstingl (1):
pinctrl: meson: meson8b: fix the sdxc_a data 1..3 pins

Masaru Nagai (1):
ravb: Decrease TxFIFO depth of Q3 and Q2 to one

Max Filippov (5):
xtensa: SMP: fix ccount_timer_shutdown
xtensa: SMP: fix secondary CPU initialization
xtensa: smp_lx200_defconfig: fix vectors clash
xtensa: SMP: mark each possible CPU as present
xtensa: SMP: limit number of possible CPUs by NR_CPUS

Miaohe Lin (1):
net: sit: fix UBSAN Undefined behaviour in check_6rd

Michael Chan (1):
bnxt_en: Drop oversize TX packets to prevent errors.

Michal Hocko (1):
mm, memory_hotplug: is_mem_section_removable do not pass the end of a zone

Mike Kravetz (1):
hugetlbfs: fix races and page leaks during migration

Mikhail Zaslonko (1):
mm, memory_hotplug: test_pages_in_a_zone do not pass the end of zone

Ming Lu (1):
scsi: libfc: free skb when receiving invalid flogi resp

Nathan Chancellor (3):
mfd: twl-core: Fix section annotations on {,un}protect_pm_master
mfd: db8500-prcmu: Fix some section annotations
isdn: avm: Fix string plus integer warning from Clang

Nazarov Sergey (2):
net: Add __icmp_send helper.
net: avoid use IPCB in cipso_v4_error

NeilBrown (2):
dm: fix to_sector() for 32bit
nfsd: fix memory corruption caused by readdir

Pablo Neira Ayuso (1):
netfilter: x_tables: enforce nul-terminated table name from getsockopt GET_ENTRIES

Pan Bian (1):
autofs: drop dentry reference only when it is never used

Pankaj Gupta (1):
crypto: caam - fixed handling of sg list

Paul Cercueil (1):
clk: ingenic: Fix round_rate misbehaving with non-integer dividers

Paul Moore (1):
netlabel: fix out-of-bounds memory accesses

Pavel Shilovsky (1):
CIFS: Fix read after write for files with read caching

Peng Hao (1):
ARM: pxa: ssp: unneeded to free devm_ allocated data

Peng Tao (1):
NFS41: pop some layoutget errors to application

Peter Zijlstra (1):
futex,rt_mutex: Restructure rt_mutex_finish_proxy_lock()

Phil Turnbull (1):
netfilter: nfnetlink_acct: validate NFACCT_FILTER parameters

Phuong Nguyen (1):
dmaengine: usb-dmac: Make DMAC system sleep callbacks explicit

Qian Cai (1):
x86_64: increase stack size for KASAN_EXTRA

QiaoChong (1):
parport_pc: fix find_superio io compare code, should use equal test.

Rajasingh Thavamani (1):
net: phy: Micrel KSZ8061: link failure after cable connect

Ralph Campbell (1):
numa: change get_mempolicy() to use nr_node_ids instead of MAX_NUMNODES

Rander Wang (1):
ASoC: Intel: Haswell/Broadwell: fix setting for .dynamic field

Roman Penyaev (1):
mm/vmalloc: fix size check for remap_vmalloc_range_partial()

Ronnie Sahlberg (1):
cifs: fix computation for MAX_SMB2_HDR_SIZE

S.j. Wang (1):
ASoC: fsl_esai: fix register setting issue in RIGHT_J mode

Saeed Mahameed (1):
net/mlx4_en: Force CHECKSUM_NONE for short ethernet frames

Sakari Ailus (1):
media: uvcvideo: Avoid NULL pointer dereference at the end of streaming

Sasha Levin (2):
Revert "x86/platform/UV: Use efi_runtime_lock to serialise BIOS calls" fs/9p: use fscache mutex rather than spinlock

Sean Christopherson (2):
KVM: nVMX: Sign extend displacements of VMX instr's mem operands
KVM: nVMX: Ignore limit checks on VMX instructions using flat segments

Seth Forshee (1):
powerpc: Always initialize input array when calling epapr_hypercall()

Shubhrajyoti Datta (1):
i2c: cadence: Fix the hold bit setting

Silvio Cesare (2):
ASoC: dapm: change snprintf to scnprintf for possible overflow
ASoC: imx-audmux: change snprintf to scnprintf for possible overflow

Sinan Kaya (1):
platform/x86: Fix unmet dependency warning for SAMSUNG_Q10

Sowjanya Komatineni (1):
i2c: tegra: fix maximum transfer size

Stefan Haberland (1):
s390/dasd: fix using offset into zero size array error

Stefano Brivio (1):
vxlan: Fix GRO cells race condition between receive and link delete

Stephane Eranian (1):
perf tools: Handle TOPOLOGY headers with no CPU

Steve Longerbeam (1):
gpu: ipu-v3: Fix CSI offsets for imx53

Stuart Menefy (3):
regulator: s2mpa01: Fix step values for some LDOs clocksource/drivers/exynos_mct: Move one-shot check from tick clear to ISR clocksource/drivers/exynos_mct: Clear timer interrupt when shutdown

Su Yanjun (1):
vti4: Fix a ipip packet processing bug in 'IPCOMP' virtual tunnel

Suravee Suthikulpanit (1):
iommu/amd: Fix IOMMU page flush when detach device from a domain

Takashi Sakamoto (1):
ALSA: bebob: use more identical mod_alias for Saffire Pro 10 I/O against Liquid Saffire 56

Thomas Bogendoerfer (1):
MIPS: jazz: fix 64bit build

Thomas Falcon (1):
ibmveth: Do not process frames after calling napi_reschedule

Tomonori Sakita (2):
serial: fsl_lpuart: fix maximum acceptable baud rate with over-sampling
net: altera_tse: fix msgdma_tx_completion on non-zero fill_level case

Trond Myklebust (2):
NFS: Fix an I/O request leakage in nfs_do_recoalesce
NFS: Don't recoalesce on error in nfs_pageio_complete_mirror()

Varun Prakash (1):
scsi: csiostor: fix NULL pointer dereference in csio_vport_set_state()

Vignesh R (1):
mfd: ti_am335x_tscadc: Use PLATFORM_DEVID_AUTO while registering mfd cells

Vincent Batts (1):
Input: elan_i2c - add id for touchpad found in Lenovo s21e-20

Vineet Gupta (1):
ARC: uacces: remove lp_start, lp_end from clobber list

Viresh Kumar (2):
cpufreq: Use struct kobj_attribute instead of struct global_attr PM / wakeup: Rework wakeup source timer cancellation

Vitaly Kuznetsov (1):
KVM: nSVM: clear events pending from svm_complete_interrupts() when exiting to L1

Vladimir Murzin (1):
arm64: Relax GIC version check during early boot

Wanpeng Li (1):
KVM: X86: Fix residual mmio emulation request to userspace

Xiao Ni (1):
It's wrong to add len to sector_nr in raid10 reshape twice

Xin Long (2):
pptp: dst_release sk_dst_cache in pptp_sock_destruct
route: set the deleted fnhe fnhe_daddr to 0 in ip_del_fnhe to fix a race

Yan, Zheng (1):

      ceph: avoid repeatedly adding inode to mdsc->snap_flush_list

Yangtao Li (1):
cpufreq: tegra124: add missing of_node_put()

Yao Liu (1):
nfs: Fix NULL pointer dereference of dev_name

Yihao Wu (1):
nfsd: fix wrong check in write_v4_end_grace()

Yizhuo (1):
ARM: OMAP2+: Variable "reg" in function omap4_dsi_mux_pads() could be uninitialized

Yonglong Liu (2):
net: hns: Fix use after free identified by SLUB debug
net: hns: Fix wrong read accesses via Clause 45 MDIO protocol

YueHaibing (4):
scsi: qla4xxx: check return code of qla4xxx_copy_from_fwddb_param
net-sysfs: Fix mem leak in netdev_register_kobject
net: nfc: Fix NULL dereference on nfc_llcp_build_tlv fails
mdio_bus: Fix use-after-free on device_register fails

Zeng Tao (1):
usb: dwc3: gadget: Fix the uninitialized link_state when udc starts

Zev Weiss (1):
kernel/sysctl.c: add missing range check in do_proc_dointvec_minmax_conv

Zhang, Jun (1):
rcu: Do RCU GP kthread self-wakeup from softirq and interrupt

ZhangXiaoxu (1):
ipvs: Fix signed integer overflow when setsockopt timeout

Zhi Jin (1):
stm class: Fix an endless loop in channel allocation

zhangyi (F) (3):
tracing: Do not free iter->trace in fail path of tracing_open_pipe()
jbd2: clear dirty flag when revoking a buffer from an older transaction
jbd2: fix compile warning when using JBUFFER_TRACE

zhengbin (1):
9p/net: fix memory leak in p9_client_create

author maintainer
#1 lore raw
Makefile +1 -1
index d7a3b832e0fd..1de443248119 100644
@@ -1,6 +1,6 @@
 VERSION = 4
 PATCHLEVEL = 4
-SUBLEVEL = 176
+SUBLEVEL = 177
 EXTRAVERSION =
 NAME = Blurry Fish Butt
 
arch/arc/include/asm/bitops.h +3 -3
index 0352fb8d21b9..9623ae002f5b 100644
@@ -286,7 +286,7 @@ static inline __attribute__ ((const)) int __fls(unsigned long x)
 /*
  * __ffs: Similar to ffs, but zero based (0-31)
  */
-static inline __attribute__ ((const)) int __ffs(unsigned long word)
+static inline __attribute__ ((const)) unsigned long __ffs(unsigned long word)
 {
 	if (!word)
 		return word;
@@ -346,9 +346,9 @@ static inline __attribute__ ((const)) int ffs(unsigned long x)
 /*
  * __ffs: Similar to ffs, but zero based (0-31)
  */
-static inline __attribute__ ((const)) int __ffs(unsigned long x)
+static inline __attribute__ ((const)) unsigned long __ffs(unsigned long x)
 {
-	int n;
+	unsigned long n;
 
 	asm volatile(
 	"	ffs.f	%0, %1		\n"  /* 0:31; 31(Z) if src 0 */
arch/arc/include/asm/uaccess.h +4 -4
index 57387b567f34..f077a419cb51 100644
@@ -209,7 +209,7 @@ __arc_copy_from_user(void *to, const void __user *from, unsigned long n)
 		*/
 		  "=&r" (tmp), "+r" (to), "+r" (from)
 		:
-		: "lp_count", "lp_start", "lp_end", "memory");
+		: "lp_count", "memory");
 
 		return n;
 	}
@@ -438,7 +438,7 @@ __arc_copy_to_user(void __user *to, const void *from, unsigned long n)
 		 */
 		  "=&r" (tmp), "+r" (to), "+r" (from)
 		:
-		: "lp_count", "lp_start", "lp_end", "memory");
+		: "lp_count", "memory");
 
 		return n;
 	}
@@ -658,7 +658,7 @@ static inline unsigned long __arc_clear_user(void __user *to, unsigned long n)
 	"	.previous			\n"
 	: "+r"(d_char), "+r"(res)
 	: "i"(0)
-	: "lp_count", "lp_start", "lp_end", "memory");
+	: "lp_count", "memory");
 
 	return res;
 }
@@ -691,7 +691,7 @@ __arc_strncpy_from_user(char *dst, const char __user *src, long count)
 	"	.previous			\n"
 	: "+r"(res), "+r"(dst), "+r"(src), "=r"(val)
 	: "g"(-EFAULT), "r"(count)
-	: "lp_count", "lp_start", "lp_end", "memory");
+	: "lp_count", "memory");
 
 	return res;
 }
arch/arc/kernel/head.S +10 -0
index 689dd867fdff..cd64cb4ef7b0 100644
@@ -17,6 +17,7 @@
 #include <asm/entry.h>
 #include <asm/arcregs.h>
 #include <asm/cache.h>
+#include <asm/irqflags.h>
 
 .macro CPU_EARLY_SETUP
 
@@ -47,6 +48,15 @@
 	sr	r5, [ARC_REG_DC_CTRL]
 
 1:
+
+#ifdef CONFIG_ISA_ARCV2
+	; Unaligned access is disabled at reset, so re-enable early as
+	; gcc 7.3.1 (ARC GNU 2018.03) onwards generates unaligned access
+	; by default
+	lr	r5, [status32]
+	bset	r5, r5, STATUS_AD_BIT
+	kflag	r5
+#endif
 .endm
 
 	.section .init.text, "ax",@progbits
arch/arm/Kconfig +1 -0
index 34e1569a11ee..3a0277c6c060 100644
@@ -1475,6 +1475,7 @@ config NR_CPUS
 config HOTPLUG_CPU
 	bool "Support for hot-pluggable CPUs"
 	depends on SMP
+	select GENERIC_IRQ_MIGRATION
 	help
 	  Say Y here to experiment with turning CPUs off and on.  CPUs
 	  can be controlled through /sys/devices/system/cpu.
arch/arm/boot/dts/exynos3250.dtsi +3 -0
index 2f30d632f1cc..e81a27214188 100644
@@ -150,6 +150,9 @@
 			interrupt-controller;
 			#interrupt-cells = <3>;
 			interrupt-parent = <&gic>;
+			clock-names = "clkout8";
+			clocks = <&cmu CLK_FIN_PLL>;
+			#clock-cells = <1>;
 		};
 
 		mipi_phy: video-phy@10020710 {
arch/arm/boot/dts/exynos5420-tmu-sensor-conf.dtsi new file +25 -0
new file mode 100644
index 000000000000..c8771c660550
@@ -0,0 +1,25 @@
+/*
+ * Device tree sources for Exynos5420 TMU sensor configuration
+ *
+ * Copyright (c) 2014 Lukasz Majewski <[email protected]>
+ * Copyright (c) 2017 Krzysztof Kozlowski <[email protected]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <dt-bindings/thermal/thermal_exynos.h>
+
+#thermal-sensor-cells = <0>;
+samsung,tmu_gain = <8>;
+samsung,tmu_reference_voltage = <16>;
+samsung,tmu_noise_cancel_mode = <4>;
+samsung,tmu_efuse_value = <55>;
+samsung,tmu_min_efuse_value = <0>;
+samsung,tmu_max_efuse_value = <100>;
+samsung,tmu_first_point_trim = <25>;
+samsung,tmu_second_point_trim = <85>;
+samsung,tmu_default_temp_offset = <50>;
+samsung,tmu_cal_type = <TYPE_ONE_POINT_TRIMMING>;
arch/arm/boot/dts/exynos5420.dtsi +5 -5
index 1b3d6c769a3c..d5edb7766942 100644
@@ -777,7 +777,7 @@
 		interrupts = <0 65 0>;
 		clocks = <&clock CLK_TMU>;
 		clock-names = "tmu_apbif";
-		#include "exynos4412-tmu-sensor-conf.dtsi"
+		#include "exynos5420-tmu-sensor-conf.dtsi"
 	};
 
 	tmu_cpu1: tmu@10064000 {
@@ -786,7 +786,7 @@
 		interrupts = <0 183 0>;
 		clocks = <&clock CLK_TMU>;
 		clock-names = "tmu_apbif";
-		#include "exynos4412-tmu-sensor-conf.dtsi"
+		#include "exynos5420-tmu-sensor-conf.dtsi"
 	};
 
 	tmu_cpu2: tmu@10068000 {
@@ -795,7 +795,7 @@
 		interrupts = <0 184 0>;
 		clocks = <&clock CLK_TMU>, <&clock CLK_TMU>;
 		clock-names = "tmu_apbif", "tmu_triminfo_apbif";
-		#include "exynos4412-tmu-sensor-conf.dtsi"
+		#include "exynos5420-tmu-sensor-conf.dtsi"
 	};
 
 	tmu_cpu3: tmu@1006c000 {
@@ -804,7 +804,7 @@
 		interrupts = <0 185 0>;
 		clocks = <&clock CLK_TMU>, <&clock CLK_TMU_GPU>;
 		clock-names = "tmu_apbif", "tmu_triminfo_apbif";
-		#include "exynos4412-tmu-sensor-conf.dtsi"
+		#include "exynos5420-tmu-sensor-conf.dtsi"
 	};
 
 	tmu_gpu: tmu@100a0000 {
@@ -813,7 +813,7 @@
 		interrupts = <0 215 0>;
 		clocks = <&clock CLK_TMU_GPU>, <&clock CLK_TMU>;
 		clock-names = "tmu_apbif", "tmu_triminfo_apbif";
-		#include "exynos4412-tmu-sensor-conf.dtsi"
+		#include "exynos5420-tmu-sensor-conf.dtsi"
 	};
 
 	thermal-zones {
arch/arm/include/asm/irq.h +0 -1
index 1bd9510de1b9..cae4df39f02e 100644
@@ -24,7 +24,6 @@
 #ifndef __ASSEMBLY__
 struct irqaction;
 struct pt_regs;
-extern void migrate_irqs(void);
 
 extern void asm_do_IRQ(unsigned int, struct pt_regs *);
 void handle_IRQ(unsigned int, struct pt_regs *);
arch/arm/kernel/irq.c +0 -62

71 lines not on this page · raw message

arch/arm/kernel/smp.c +1 -1
index e42be5800f37..08ce9e36dc5a 100644
@@ -218,7 +218,7 @@ int __cpu_disable(void)
 	/*
 	 * OK - migrate IRQs away from this CPU
 	 */
-	migrate_irqs();
+	irq_migrate_all_off_this_cpu();
 
 	/*
 	 * Flush user cache and TLB mappings, and then remove this CPU
arch/arm/kvm/mmio.c +6 -4
index 885cd0e0015b..ae61e2ea7255 100644
@@ -87,11 +87,10 @@ static unsigned long mmio_read_buf(char *buf, unsigned int len)
 
 /**
  * kvm_handle_mmio_return -- Handle MMIO loads after user space emulation
+ *			     or in-kernel IO emulation
+ *
  * @vcpu: The VCPU pointer
  * @run:  The VCPU run struct containing the mmio data
- *
- * This should only be called after returning from userspace for MMIO load
- * emulation.
  */
 int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run)
 {
@@ -207,14 +206,17 @@ int io_mem_abort(struct kvm_vcpu *vcpu, struct kvm_run *run,
 	run->mmio.is_write	= is_write;
 	run->mmio.phys_addr	= fault_ipa;
 	run->mmio.len		= len;
-	memcpy(run->mmio.data, data_buf, len);
 
 	if (!ret) {
 		/* We handled the access successfully in the kernel. */
+		if (!is_write)
+			memcpy(run->mmio.data, data_buf, len);
 		kvm_handle_mmio_return(vcpu, run);
 		return 1;
 	}
 
+	if (is_write)
+		memcpy(run->mmio.data, data_buf, len);
 	run->exit_reason	= KVM_EXIT_MMIO;
 	return 0;
 }
arch/arm/mach-omap2/display.c +6 -1
index 6ab13d18c636..cde86d1199cf 100644
@@ -115,6 +115,7 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
 	u32 enable_mask, enable_shift;
 	u32 pipd_mask, pipd_shift;
 	u32 reg;
+	int ret;
 
 	if (dsi_id == 0) {
 		enable_mask = OMAP4_DSI1_LANEENABLE_MASK;
@@ -130,7 +131,11 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
 		return -ENODEV;
 	}
 
-	regmap_read(omap4_dsi_mux_syscon, OMAP4_DSIPHY_SYSCON_OFFSET, &reg);
+	ret = regmap_read(omap4_dsi_mux_syscon,
+					  OMAP4_DSIPHY_SYSCON_OFFSET,
+					  &reg);
+	if (ret)
+		return ret;
 
 	reg &= ~enable_mask;
 	reg &= ~pipd_mask;
arch/arm/mach-s3c24xx/mach-osiris-dvs.c +4 -4
index ce2db235dbaf..5e8a306163de 100644
@@ -70,16 +70,16 @@ static int osiris_dvs_notify(struct notifier_block *nb,
 
 	switch (val) {
 	case CPUFREQ_PRECHANGE:
-		if (old_dvs & !new_dvs ||
-		    cur_dvs & !new_dvs) {
+		if ((old_dvs && !new_dvs) ||
+		    (cur_dvs && !new_dvs)) {
 			pr_debug("%s: exiting dvs\n", __func__);
 			cur_dvs = false;
 			gpio_set_value(OSIRIS_GPIO_DVS, 1);
 		}
 		break;
 	case CPUFREQ_POSTCHANGE:
-		if (!old_dvs & new_dvs ||
-		    !cur_dvs & new_dvs) {
+		if ((!old_dvs && new_dvs) ||
+		    (!cur_dvs && new_dvs)) {
 			pr_debug("entering dvs\n");
 			cur_dvs = true;
 			gpio_set_value(OSIRIS_GPIO_DVS, 0);
arch/arm/plat-pxa/ssp.c +0 -3
index daa1a65f2eb7..6748827c2ec8 100644
@@ -238,8 +238,6 @@ static int pxa_ssp_remove(struct platform_device *pdev)
 	if (ssp == NULL)
 		return -ENODEV;
 
-	iounmap(ssp->mmio_base);
-
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	release_mem_region(res->start, resource_size(res));
 
@@ -249,7 +247,6 @@ static int pxa_ssp_remove(struct platform_device *pdev)
 	list_del(&ssp->node);
 	mutex_unlock(&ssp_lock);
 
-	kfree(ssp);
 	return 0;
 }
 
arch/arm64/crypto/aes-ce-ccm-core.S +3 -2
index 3363560c79b7..7bc459d9235c 100644
@@ -74,12 +74,13 @@ ENTRY(ce_aes_ccm_auth_data)
 	beq	10f
 	ext	v0.16b, v0.16b, v0.16b, #1	/* rotate out the mac bytes */
 	b	7b
-8:	mov	w7, w8
+8:	cbz	w8, 91f
+	mov	w7, w8
 	add	w8, w8, #16
 9:	ext	v1.16b, v1.16b, v1.16b, #1
 	adds	w7, w7, #1
 	bne	9b
-	eor	v0.16b, v0.16b, v1.16b
+91:	eor	v0.16b, v0.16b, v1.16b
 	st1	{v0.16b}, [x0]
 10:	str	w8, [x3]
 	ret
arch/arm64/kernel/head.S +1 -2
index 0382eba4bf7b..6299a8a361ee 100644
@@ -478,8 +478,7 @@ CPU_LE(	bic	x0, x0, #(3 << 24)	)	// Clear the EE and E0E bits for EL1
 	/* GICv3 system register access */
 	mrs	x0, id_aa64pfr0_el1
 	ubfx	x0, x0, #24, #4
-	cmp	x0, #1
-	b.ne	3f
+	cbz	x0, 3f
 
 	mrs_s	x0, ICC_SRE_EL2
 	orr	x0, x0, #ICC_SRE_EL2_SRE	// Set ICC_SRE_EL2.SRE==1
arch/m68k/Makefile +4 -1
index 0b29dcfef69f..0c736ed58abd 100644
@@ -59,7 +59,10 @@ cpuflags-$(CONFIG_M5206e)	:= $(call cc-option,-mcpu=5206e,-m5200)
 cpuflags-$(CONFIG_M5206)	:= $(call cc-option,-mcpu=5206,-m5200)
 
 KBUILD_AFLAGS += $(cpuflags-y)
-KBUILD_CFLAGS += $(cpuflags-y) -pipe
+KBUILD_CFLAGS += $(cpuflags-y)
+
+KBUILD_CFLAGS += -pipe -ffreestanding
+
 ifdef CONFIG_MMU
 # without -fno-strength-reduce the 53c7xx.c driver fails ;-(
 KBUILD_CFLAGS += -fno-strength-reduce -ffixed-a2
arch/mips/configs/ath79_defconfig +1 -0
index 134879c1310a..4ed369c0ec6a 100644
@@ -74,6 +74,7 @@ CONFIG_SERIAL_8250_CONSOLE=y
 # CONFIG_SERIAL_8250_PCI is not set
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=1
+CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SERIAL_AR933X=y
 CONFIG_SERIAL_AR933X_CONSOLE=y
 # CONFIG_HW_RANDOM is not set
arch/mips/jazz/jazzdma.c +3 -2
index db6f5afff4ff..ea897912bc71 100644
@@ -71,14 +71,15 @@ static int __init vdma_init(void)
 						    get_order(VDMA_PGTBL_SIZE));
 	BUG_ON(!pgtbl);
 	dma_cache_wback_inv((unsigned long)pgtbl, VDMA_PGTBL_SIZE);
-	pgtbl = (VDMA_PGTBL_ENTRY *)KSEG1ADDR(pgtbl);
+	pgtbl = (VDMA_PGTBL_ENTRY *)CKSEG1ADDR((unsigned long)pgtbl);
 
 	/*
 	 * Clear the R4030 translation table
 	 */
 	vdma_pgtbl_init();
 
-	r4030_write_reg32(JAZZ_R4030_TRSTBL_BASE, CPHYSADDR(pgtbl));
+	r4030_write_reg32(JAZZ_R4030_TRSTBL_BASE,
+			  CPHYSADDR((unsigned long)pgtbl));
 	r4030_write_reg32(JAZZ_R4030_TRSTBL_LIM, VDMA_PGTBL_SIZE);
 	r4030_write_reg32(JAZZ_R4030_TRSTBL_INV, 0);
 
arch/mips/kernel/irq.c +2 -2
index dc1180a8bfa1..66736397af9f 100644
@@ -52,6 +52,7 @@ asmlinkage void spurious_interrupt(void)
 void __init init_IRQ(void)
 {
 	int i;
+	unsigned int order = get_order(IRQ_STACK_SIZE);
 
 	for (i = 0; i < NR_IRQS; i++)
 		irq_set_noprobe(i);
@@ -59,8 +60,7 @@ void __init init_IRQ(void)
 	arch_init_irq();
 
 	for_each_possible_cpu(i) {
-		int irq_pages = IRQ_STACK_SIZE / PAGE_SIZE;
-		void *s = (void *)__get_free_pages(GFP_KERNEL, irq_pages);
+		void *s = (void *)__get_free_pages(GFP_KERNEL, order);
 
 		irq_stack[i] = s;
 		pr_debug("CPU%d IRQ stack at 0x%p - 0x%p\n", i,
arch/mips/kernel/process.c +3 -4
index ebd8a715fe38..e6102775892d 100644
@@ -339,7 +339,7 @@ static inline int is_sp_move_ins(union mips_instruction *ip)
 static int get_frame_info(struct mips_frame_info *info)
 {
 	bool is_mmips = IS_ENABLED(CONFIG_CPU_MICROMIPS);
-	union mips_instruction insn, *ip, *ip_end;
+	union mips_instruction insn, *ip;
 	const unsigned int max_insns = 128;
 	unsigned int last_insn_size = 0;
 	unsigned int i;
@@ -351,10 +351,9 @@ static int get_frame_info(struct mips_frame_info *info)
 	if (!ip)
 		goto err;
 
-	ip_end = (void *)ip + info->func_size;
-
-	for (i = 0; i < max_insns && ip < ip_end; i++) {
+	for (i = 0; i < max_insns; i++) {
 		ip = (void *)ip + last_insn_size;
+
 		if (is_mmips && mm_insn_16bit(ip->halfword[0])) {
 			insn.halfword[0] = 0;
 			insn.halfword[1] = ip->halfword[0];
arch/powerpc/include/asm/epapr_hcalls.h +6 -6
index 334459ad145b..90863245df53 100644
@@ -508,7 +508,7 @@ static unsigned long epapr_hypercall(unsigned long *in,
 
 static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)
 {
-	unsigned long in[8];
+	unsigned long in[8] = {0};
 	unsigned long out[8];
 	unsigned long r;
 
@@ -520,7 +520,7 @@ static inline long epapr_hypercall0_1(unsigned int nr, unsigned long *r2)
 
 static inline long epapr_hypercall0(unsigned int nr)
 {
-	unsigned long in[8];
+	unsigned long in[8] = {0};
 	unsigned long out[8];
 
 	return epapr_hypercall(in, out, nr);
@@ -528,7 +528,7 @@ static inline long epapr_hypercall0(unsigned int nr)
 
 static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)
 {
-	unsigned long in[8];
+	unsigned long in[8] = {0};
 	unsigned long out[8];
 
 	in[0] = p1;
@@ -538,7 +538,7 @@ static inline long epapr_hypercall1(unsigned int nr, unsigned long p1)
 static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,
 				    unsigned long p2)
 {
-	unsigned long in[8];
+	unsigned long in[8] = {0};
 	unsigned long out[8];
 
 	in[0] = p1;
@@ -549,7 +549,7 @@ static inline long epapr_hypercall2(unsigned int nr, unsigned long p1,
 static inline long epapr_hypercall3(unsigned int nr, unsigned long p1,
 				    unsigned long p2, unsigned long p3)
 {
-	unsigned long in[8];
+	unsigned long in[8] = {0};
 	unsigned long out[8];
 
 	in[0] = p1;
@@ -562,7 +562,7 @@ static inline long epapr_hypercall4(unsigned int nr, unsigned long p1,
 				    unsigned long p2, unsigned long p3,
 				    unsigned long p4)
 {
-	unsigned long in[8];
+	unsigned long in[8] = {0};
 	unsigned long out[8];
 
 	in[0] = p1;
arch/powerpc/kernel/entry_32.S +9 -0
index 2405631e91a2..3728e617e17e 100644
@@ -685,6 +685,9 @@ fast_exception_return:
 	mtcr	r10
 	lwz	r10,_LINK(r11)
 	mtlr	r10
+	/* Clear the exception_marker on the stack to avoid confusing stacktrace */
+	li	r10, 0
+	stw	r10, 8(r11)
 	REST_GPR(10, r11)
 	mtspr	SPRN_SRR1,r9
 	mtspr	SPRN_SRR0,r12
@@ -915,6 +918,9 @@ END_FTR_SECTION_IFSET(CPU_FTR_NEED_PAIRED_STWCX)
 	mtcrf	0xFF,r10
 	mtlr	r11
 
+	/* Clear the exception_marker on the stack to avoid confusing stacktrace */
+	li	r10, 0
+	stw	r10, 8(r1)
 	/*
 	 * Once we put values in SRR0 and SRR1, we are in a state
 	 * where exceptions are not recoverable, since taking an
@@ -952,6 +958,9 @@ exc_exit_restart_end:
 	mtlr	r11
 	lwz	r10,_CCR(r1)
 	mtcrf	0xff,r10
+	/* Clear the exception_marker on the stack to avoid confusing stacktrace */
+	li	r10, 0
+	stw	r10, 8(r1)
 	REST_2GPRS(9, r1)
 	.globl exc_exit_restart
 exc_exit_restart:
arch/powerpc/platforms/83xx/suspend-asm.S +27 -7
index 3d1ecd211776..8137f77abad5 100644
@@ -26,13 +26,13 @@
 #define SS_MSR		0x74
 #define SS_SDR1		0x78
 #define SS_LR		0x7c
-#define SS_SPRG		0x80 /* 4 SPRGs */
-#define SS_DBAT		0x90 /* 8 DBATs */
-#define SS_IBAT		0xd0 /* 8 IBATs */
-#define SS_TB		0x110
-#define SS_CR		0x118
-#define SS_GPREG	0x11c /* r12-r31 */
-#define STATE_SAVE_SIZE 0x16c
+#define SS_SPRG		0x80 /* 8 SPRGs */
+#define SS_DBAT		0xa0 /* 8 DBATs */
+#define SS_IBAT		0xe0 /* 8 IBATs */
+#define SS_TB		0x120
+#define SS_CR		0x128
+#define SS_GPREG	0x12c /* r12-r31 */
+#define STATE_SAVE_SIZE 0x17c
 
 	.section .data
 	.align	5
@@ -103,6 +103,16 @@ _GLOBAL(mpc83xx_enter_deep_sleep)
 	stw	r7, SS_SPRG+12(r3)
 	stw	r8, SS_SDR1(r3)
 
+	mfspr	r4, SPRN_SPRG4
+	mfspr	r5, SPRN_SPRG5
+	mfspr	r6, SPRN_SPRG6
+	mfspr	r7, SPRN_SPRG7
+
+	stw	r4, SS_SPRG+16(r3)
+	stw	r5, SS_SPRG+20(r3)
+	stw	r6, SS_SPRG+24(r3)
+	stw	r7, SS_SPRG+28(r3)
+
 	mfspr	r4, SPRN_DBAT0U
 	mfspr	r5, SPRN_DBAT0L
 	mfspr	r6, SPRN_DBAT1U
@@ -493,6 +503,16 @@ mpc83xx_deep_resume:
 	mtspr	SPRN_IBAT7U, r6
 	mtspr	SPRN_IBAT7L, r7
 
+	lwz	r4, SS_SPRG+16(r3)
+	lwz	r5, SS_SPRG+20(r3)
+	lwz	r6, SS_SPRG+24(r3)
+	lwz	r7, SS_SPRG+28(r3)
+
+	mtspr	SPRN_SPRG4, r4
+	mtspr	SPRN_SPRG5, r5
+	mtspr	SPRN_SPRG6, r6
+	mtspr	SPRN_SPRG7, r7
+
 	lwz	r4, SS_SPRG+0(r3)
 	lwz	r5, SS_SPRG+4(r3)
 	lwz	r6, SS_SPRG+8(r3)
arch/powerpc/platforms/embedded6xx/wii.c +4 -0
index 352592d3e44e..7fd19a480422 100644
@@ -104,6 +104,10 @@ unsigned long __init wii_mmu_mapin_mem2(unsigned long top)
 	/* MEM2 64MB@0x10000000 */
 	delta = wii_hole_start + wii_hole_size;
 	size = top - delta;
+
+	if (__map_without_bats)
+		return delta;
+
 	for (bl = 128<<10; bl < max_size; bl <<= 1) {
 		if (bl * 2 > size)
 			break;
arch/powerpc/platforms/powernv/opal-msglog.c +1 -1
index 44ed78af1a0d..9021b7272889 100644
@@ -92,7 +92,7 @@ out:
 }
 
 static struct bin_attribute opal_msglog_attr = {
-	.attr = {.name = "msglog", .mode = 0444},
+	.attr = {.name = "msglog", .mode = 0400},
 	.read = opal_msglog_read
 };
 
arch/x86/include/asm/page_64_types.h +4 -0
index 4928cf0d5af0..fb1251946b45 100644
@@ -2,7 +2,11 @@
 #define _ASM_X86_PAGE_64_DEFS_H
 
 #ifdef CONFIG_KASAN
+#ifdef CONFIG_KASAN_EXTRA
+#define KASAN_STACK_ORDER 2
+#else
 #define KASAN_STACK_ORDER 1
+#endif
 #else
 #define KASAN_STACK_ORDER 0
 #endif
arch/x86/include/asm/uaccess.h +4 -3
index 6f8eadf0681f..ac6932bf1a01 100644
@@ -314,8 +314,7 @@ do {									\
 		__put_user_asm(x, ptr, retval, "l", "k", "ir", errret);	\
 		break;							\
 	case 8:								\
-		__put_user_asm_u64((__typeof__(*ptr))(x), ptr, retval,	\
-				   errret);				\
+		__put_user_asm_u64(x, ptr, retval, errret);		\
 		break;							\
 	default:							\
 		__put_user_bad();					\
@@ -426,8 +425,10 @@ do {									\
 #define __put_user_nocheck(x, ptr, size)			\
 ({								\
 	int __pu_err;						\
+	__typeof__(*(ptr)) __pu_val;				\
+	__pu_val = x;						\
 	__uaccess_begin();					\
-	__put_user_size((x), (ptr), (size), __pu_err, -EFAULT);	\
+	__put_user_size(__pu_val, (ptr), (size), __pu_err, -EFAULT);\
 	__uaccess_end();					\
 	__builtin_expect(__pu_err, 0);				\
 })
arch/x86/include/asm/uv/bios.h +1 -7
index 8b7594f2d48f..71605c7d5c5c 100644
@@ -48,8 +48,7 @@ enum {
 	BIOS_STATUS_SUCCESS		=  0,
 	BIOS_STATUS_UNIMPLEMENTED	= -ENOSYS,
 	BIOS_STATUS_EINVAL		= -EINVAL,
-	BIOS_STATUS_UNAVAIL		= -EBUSY,
-	BIOS_STATUS_ABORT		= -EINTR,
+	BIOS_STATUS_UNAVAIL		= -EBUSY
 };
 
 /*
@@ -112,9 +111,4 @@ extern long system_serial_number;
 
 extern struct kobject *sgi_uv_kobj;	/* /sys/firmware/sgi_uv */
 
-/*
- * EFI runtime lock; cf. firmware/efi/runtime-wrappers.c for details
- */
-extern struct semaphore __efi_uv_runtime_lock;
-
 #endif /* _ASM_X86_UV_BIOS_H */
arch/x86/kernel/cpu/amd.c +3 -5
index 9f6151884249..e94e6f16172b 100644
@@ -716,11 +716,9 @@ static void init_amd_bd(struct cpuinfo_x86 *c)
 static void init_amd_zn(struct cpuinfo_x86 *c)
 {
 	set_cpu_cap(c, X86_FEATURE_ZEN);
-	/*
-	 * Fix erratum 1076: CPB feature bit not being set in CPUID. It affects
-	 * all up to and including B1.
-	 */
-	if (c->x86_model <= 1 && c->x86_mask <= 1)
+
+	/* Fix erratum 1076: CPB feature bit not being set in CPUID. */
+	if (!cpu_has(c, X86_FEATURE_CPB))
 		set_cpu_cap(c, X86_FEATURE_CPB);
 }
 
arch/x86/kernel/kexec-bzimage64.c +3 -0
index 0f8a6bbaaa44..0bf17576dd2a 100644
@@ -168,6 +168,9 @@ setup_efi_state(struct boot_params *params, unsigned long params_load_addr,
 	struct efi_info *current_ei = &boot_params.efi_info;
 	struct efi_info *ei = &params->efi_info;
 
+	if (!efi_enabled(EFI_RUNTIME_SERVICES))
+		return 0;
+
 	if (!current_ei->efi_memmap_size)
 		return 0;
 
arch/x86/kvm/svm.c +8 -0
index 7ce1a19d9d8b..acbde1249b6f 100644
@@ -2388,6 +2388,14 @@ static int nested_svm_vmexit(struct vcpu_svm *svm)
 	kvm_mmu_reset_context(&svm->vcpu);
 	kvm_mmu_load(&svm->vcpu);
 
+	/*
+	 * Drop what we picked up for L2 via svm_complete_interrupts() so it
+	 * doesn't end up in L1.
+	 */
+	svm->vcpu.arch.nmi_injected = false;
+	kvm_clear_exception_queue(&svm->vcpu);
+	kvm_clear_interrupt_queue(&svm->vcpu);
+
 	return 0;
 }
 
arch/x86/kvm/vmx.c +14 -3
index 14553f6c03a6..098be61a6b4c 100644
@@ -5574,6 +5574,7 @@ static int handle_external_interrupt(struct kvm_vcpu *vcpu)
 static int handle_triple_fault(struct kvm_vcpu *vcpu)
 {
 	vcpu->run->exit_reason = KVM_EXIT_SHUTDOWN;
+	vcpu->mmio_needed = 0;
 	return 0;
 }
 
@@ -6656,6 +6657,10 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu,
 	/* Addr = segment_base + offset */
 	/* offset = base + [index * scale] + displacement */
 	off = exit_qualification; /* holds the displacement */
+	if (addr_size == 1)
+		off = (gva_t)sign_extend64(off, 31);
+	else if (addr_size == 0)
+		off = (gva_t)sign_extend64(off, 15);
 	if (base_is_valid)
 		off += kvm_register_read(vcpu, base_reg);
 	if (index_is_valid)
@@ -6698,10 +6703,16 @@ static int get_vmx_mem_address(struct kvm_vcpu *vcpu,
 		/* Protected mode: #GP(0)/#SS(0) if the segment is unusable.
 		 */
 		exn = (s.unusable != 0);
-		/* Protected mode: #GP(0)/#SS(0) if the memory
-		 * operand is outside the segment limit.
+
+		/*
+		 * Protected mode: #GP(0)/#SS(0) if the memory operand is
+		 * outside the segment limit.  All CPUs that support VMX ignore
+		 * limit checks for flat segments, i.e. segments with base==0,
+		 * limit==0xffffffff and of type expand-up data or code.
 		 */
-		exn = exn || (off + sizeof(u64) > s.limit);
+		if (!(s.base == 0 && s.limit == 0xffffffff &&
+		     ((s.type & 8) || !(s.type & 4))))
+			exn = exn || (off + sizeof(u64) > s.limit);
 	}
 	if (exn) {
 		kvm_queue_exception_e(vcpu,
arch/x86/kvm/x86.c +1 -0
index 6bd0538d8ebf..706c5d63a53f 100644
@@ -6478,6 +6478,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu)
 		}
 		if (kvm_check_request(KVM_REQ_TRIPLE_FAULT, vcpu)) {
 			vcpu->run->exit_reason = KVM_EXIT_SHUTDOWN;
+			vcpu->mmio_needed = 0;
 			r = 0;
 			goto out;
 		}
arch/x86/platform/uv/bios_uv.c +2 -21
index a45a1c5aabea..1584cbed0dce 100644
@@ -28,8 +28,7 @@
 
 static struct uv_systab uv_systab;
 
-static s64 __uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3,
-			u64 a4, u64 a5)
+s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5)
 {
 	struct uv_systab *tab = &uv_systab;
 	s64 ret;
@@ -44,19 +43,6 @@ static s64 __uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3,
 			a1, a2, a3, a4, a5);
 	return ret;
 }
-
-s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5)
-{
-	s64 ret;
-
-	if (down_interruptible(&__efi_uv_runtime_lock))
-		return BIOS_STATUS_ABORT;
-
-	ret = __uv_bios_call(which, a1, a2, a3, a4, a5);
-	up(&__efi_uv_runtime_lock);
-
-	return ret;
-}
 EXPORT_SYMBOL_GPL(uv_bios_call);
 
 s64 uv_bios_call_irqsave(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3,
@@ -65,15 +51,10 @@ s64 uv_bios_call_irqsave(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3,
 	unsigned long bios_flags;
 	s64 ret;
 
-	if (down_interruptible(&__efi_uv_runtime_lock))
-		return BIOS_STATUS_ABORT;
-
 	local_irq_save(bios_flags);
-	ret = __uv_bios_call(which, a1, a2, a3, a4, a5);
+	ret = uv_bios_call(which, a1, a2, a3, a4, a5);
 	local_irq_restore(bios_flags);
 
-	up(&__efi_uv_runtime_lock);
-
 	return ret;
 }
 
arch/xtensa/configs/smp_lx200_defconfig +1 -0
index 22eeacba37cc..199e05f85e89 100644
@@ -35,6 +35,7 @@ CONFIG_SMP=y
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX is not set
 # CONFIG_PCI is not set
+CONFIG_VECTORS_OFFSET=0x00002000
 CONFIG_XTENSA_PLATFORM_XTFPGA=y
 CONFIG_CMDLINE_BOOL=y
 CONFIG_CMDLINE="earlycon=uart8250,mmio32,0xfd050020,115200n8 console=ttyS0,115200n8 ip=dhcp root=/dev/nfs rw debug"
arch/xtensa/kernel/head.S +4 -1
index c7b3bedbfffe..e3823b4f9d08 100644
@@ -286,12 +286,13 @@ should_never_return:
 
 	movi	a2, cpu_start_ccount
 1:
+	memw
 	l32i	a3, a2, 0
 	beqi	a3, 0, 1b
 	movi	a3, 0
 	s32i	a3, a2, 0
-	memw
 1:
+	memw
 	l32i	a3, a2, 0
 	beqi	a3, 0, 1b
 	wsr	a3, ccount
@@ -328,11 +329,13 @@ ENTRY(cpu_restart)
 	rsr	a0, prid
 	neg	a2, a0
 	movi	a3, cpu_start_id
+	memw
 	s32i	a2, a3, 0
 #if XCHAL_DCACHE_IS_WRITEBACK
 	dhwbi	a3, 0
 #endif
 1:
+	memw
 	l32i	a2, a3, 0
 	dhi	a3, 0
 	bne	a2, a0, 1b
arch/xtensa/kernel/smp.c +27 -14

81 lines not on this page · raw message

arch/xtensa/kernel/time.c +1 -1
index b9ad9feadc2d..a992cb6a47db 100644
@@ -87,7 +87,7 @@ static int ccount_timer_shutdown(struct clock_event_device *evt)
 		container_of(evt, struct ccount_timer, evt);
 
 	if (timer->irq_enabled) {
-		disable_irq(evt->irq);
+		disable_irq_nosync(evt->irq);
 		timer->irq_enabled = 0;
 	}
 	return 0;
crypto/ahash.c +7 -7
index 6978ad86e516..595c4f3657ff 100644
@@ -85,17 +85,17 @@ static int hash_walk_new_entry(struct crypto_hash_walk *walk)
 int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
 {
 	unsigned int alignmask = walk->alignmask;
-	unsigned int nbytes = walk->entrylen;
 
 	walk->data -= walk->offset;
 
-	if (nbytes && walk->offset & alignmask && !err) {
-		walk->offset = ALIGN(walk->offset, alignmask + 1);
-		nbytes = min(nbytes,
-			     ((unsigned int)(PAGE_SIZE)) - walk->offset);
-		walk->entrylen -= nbytes;
+	if (walk->entrylen && (walk->offset & alignmask) && !err) {
+		unsigned int nbytes;
 
+		walk->offset = ALIGN(walk->offset, alignmask + 1);
+		nbytes = min(walk->entrylen,
+			     (unsigned int)(PAGE_SIZE - walk->offset));
 		if (nbytes) {
+			walk->entrylen -= nbytes;
 			walk->data += walk->offset;
 			return nbytes;
 		}
@@ -115,7 +115,7 @@ int crypto_hash_walk_done(struct crypto_hash_walk *walk, int err)
 	if (err)
 		return err;
 
-	if (nbytes) {
+	if (walk->entrylen) {
 		walk->offset = 0;
 		walk->pg++;
 		return hash_walk_next(walk);
crypto/pcbc.c +4 -10
index f654965f0933..de81f716cf26 100644
@@ -52,7 +52,7 @@ static int crypto_pcbc_encrypt_segment(struct blkcipher_desc *desc,
 	unsigned int nbytes = walk->nbytes;
 	u8 *src = walk->src.virt.addr;
 	u8 *dst = walk->dst.virt.addr;
-	u8 *iv = walk->iv;
+	u8 * const iv = walk->iv;
 
 	do {
 		crypto_xor(iv, src, bsize);
@@ -76,7 +76,7 @@ static int crypto_pcbc_encrypt_inplace(struct blkcipher_desc *desc,
 	int bsize = crypto_cipher_blocksize(tfm);
 	unsigned int nbytes = walk->nbytes;
 	u8 *src = walk->src.virt.addr;
-	u8 *iv = walk->iv;
+	u8 * const iv = walk->iv;
 	u8 tmpbuf[bsize];
 
 	do {
@@ -89,8 +89,6 @@ static int crypto_pcbc_encrypt_inplace(struct blkcipher_desc *desc,
 		src += bsize;
 	} while ((nbytes -= bsize) >= bsize);
 
-	memcpy(walk->iv, iv, bsize);
-
 	return nbytes;
 }
 
@@ -130,7 +128,7 @@ static int crypto_pcbc_decrypt_segment(struct blkcipher_desc *desc,
 	unsigned int nbytes = walk->nbytes;
 	u8 *src = walk->src.virt.addr;
 	u8 *dst = walk->dst.virt.addr;
-	u8 *iv = walk->iv;
+	u8 * const iv = walk->iv;
 
 	do {
 		fn(crypto_cipher_tfm(tfm), dst, src);
@@ -142,8 +140,6 @@ static int crypto_pcbc_decrypt_segment(struct blkcipher_desc *desc,
 		dst += bsize;
 	} while ((nbytes -= bsize) >= bsize);
 
-	memcpy(walk->iv, iv, bsize);
-
 	return nbytes;
 }
 
@@ -156,7 +152,7 @@ static int crypto_pcbc_decrypt_inplace(struct blkcipher_desc *desc,
 	int bsize = crypto_cipher_blocksize(tfm);
 	unsigned int nbytes = walk->nbytes;
 	u8 *src = walk->src.virt.addr;
-	u8 *iv = walk->iv;
+	u8 * const iv = walk->iv;
 	u8 tmpbuf[bsize];
 
 	do {
@@ -169,8 +165,6 @@ static int crypto_pcbc_decrypt_inplace(struct blkcipher_desc *desc,
 		src += bsize;
 	} while ((nbytes -= bsize) >= bsize);
 
-	memcpy(walk->iv, iv, bsize);
-
 	return nbytes;
 }
 
drivers/acpi/device_sysfs.c +5 -1
index 1521d9a41d25..a899a7abcf63 100644
@@ -202,11 +202,15 @@ static int create_of_modalias(struct acpi_device *acpi_dev, char *modalias,
 {
 	struct acpi_buffer buf = { ACPI_ALLOCATE_BUFFER };
 	const union acpi_object *of_compatible, *obj;
+	acpi_status status;
 	int len, count;
 	int i, nval;
 	char *c;
 
-	acpi_get_name(acpi_dev->handle, ACPI_SINGLE_NAME, &buf);
+	status = acpi_get_name(acpi_dev->handle, ACPI_SINGLE_NAME, &buf);
+	if (ACPI_FAILURE(status))
+		return -ENODEV;
+
 	/* DT strings are all in lower case */
 	for (c = buf.pointer; *c != '\0'; c++)
 		*c = tolower(*c);
drivers/atm/he.c +1 -1
index 0f5cb37636bc..010581e8bee0 100644
@@ -717,7 +717,7 @@ static int he_init_cs_block_rcm(struct he_dev *he_dev)
 			instead of '/ 512', use '>> 9' to prevent a call
 			to divdu3 on x86 platforms
 		*/
-		rate_cps = (unsigned long long) (1 << exp) * (man + 512) >> 9;
+		rate_cps = (unsigned long long) (1UL << exp) * (man + 512) >> 9;
 
 		if (rate_cps < 10)
 			rate_cps = 10;	/* 2.2.1 minimum payload rate is 10 cps */
drivers/base/power/wakeup.c +7 -1
index e613633ffe9c..4e01bf65317a 100644
@@ -113,7 +113,6 @@ void wakeup_source_drop(struct wakeup_source *ws)
 	if (!ws)
 		return;
 
-	del_timer_sync(&ws->timer);
 	__pm_relax(ws);
 }
 EXPORT_SYMBOL_GPL(wakeup_source_drop);
@@ -201,6 +200,13 @@ void wakeup_source_remove(struct wakeup_source *ws)
 	list_del_rcu(&ws->entry);
 	spin_unlock_irqrestore(&events_lock, flags);
 	synchronize_srcu(&wakeup_srcu);
+
+	del_timer_sync(&ws->timer);
+	/*
+	 * Clear timer.function to make wakeup_source_not_registered() treat
+	 * this wakeup source as not registered.
+	 */
+	ws->timer.function = NULL;
 }
 EXPORT_SYMBOL_GPL(wakeup_source_remove);
 
drivers/char/applicom.c +24 -11
index 14790304b84b..9fcd51095d13 100644
@@ -32,6 +32,7 @@
 #include <linux/wait.h>
 #include <linux/init.h>
 #include <linux/fs.h>
+#include <linux/nospec.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>
@@ -386,7 +387,11 @@ static ssize_t ac_write(struct file *file, const char __user *buf, size_t count,
 	TicCard = st_loc.tic_des_from_pc;	/* tic number to send            */
 	IndexCard = NumCard - 1;
 
-	if((NumCard < 1) || (NumCard > MAX_BOARD) || !apbs[IndexCard].RamIO)
+	if (IndexCard >= MAX_BOARD)
+		return -EINVAL;
+	IndexCard = array_index_nospec(IndexCard, MAX_BOARD);
+
+	if (!apbs[IndexCard].RamIO)
 		return -EINVAL;
 
 #ifdef DEBUG
@@ -697,6 +702,7 @@ static long ac_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	unsigned char IndexCard;
 	void __iomem *pmem;
 	int ret = 0;
+	static int warncount = 10;
 	volatile unsigned char byte_reset_it;
 	struct st_ram_io *adgl;
 	void __user *argp = (void __user *)arg;
@@ -711,16 +717,12 @@ static long ac_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	mutex_lock(&ac_mutex);	
 	IndexCard = adgl->num_card-1;
 	 
-	if(cmd != 6 && ((IndexCard >= MAX_BOARD) || !apbs[IndexCard].RamIO)) {
-		static int warncount = 10;
-		if (warncount) {
-			printk( KERN_WARNING "APPLICOM driver IOCTL, bad board number %d\n",(int)IndexCard+1);
-			warncount--;
-		}
-		kfree(adgl);
-		mutex_unlock(&ac_mutex);
-		return -EINVAL;
-	}
+	if (cmd != 6 && IndexCard >= MAX_BOARD)
+		goto err;
+	IndexCard = array_index_nospec(IndexCard, MAX_BOARD);
+
+	if (cmd != 6 && !apbs[IndexCard].RamIO)
+		goto err;
 
 	switch (cmd) {
 		
@@ -838,5 +840,16 @@ static long ac_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	kfree(adgl);
 	mutex_unlock(&ac_mutex);
 	return 0;
+
+err:
+	if (warncount) {
+		pr_warn("APPLICOM driver IOCTL, bad board number %d\n",
+			(int)IndexCard + 1);
+		warncount--;
+	}
+	kfree(adgl);
+	mutex_unlock(&ac_mutex);
+	return -EINVAL;
+
 }
 
drivers/clk/ingenic/cgu.c +5 -5
index 7cfb7b2a2ed6..8878efb80620 100644
@@ -355,16 +355,16 @@ ingenic_clk_round_rate(struct clk_hw *hw, unsigned long req_rate,
 	struct ingenic_clk *ingenic_clk = to_ingenic_clk(hw);
 	struct ingenic_cgu *cgu = ingenic_clk->cgu;
 	const struct ingenic_cgu_clk_info *clk_info;
-	long rate = *parent_rate;
+	unsigned int div = 1;
 
 	clk_info = &cgu->clock_info[ingenic_clk->idx];
 
 	if (clk_info->type & CGU_CLK_DIV)
-		rate /= ingenic_clk_calc_div(clk_info, *parent_rate, req_rate);
+		div = ingenic_clk_calc_div(clk_info, *parent_rate, req_rate);
 	else if (clk_info->type & CGU_CLK_FIXDIV)
-		rate /= clk_info->fixdiv.div;
+		div = clk_info->fixdiv.div;
 
-	return rate;
+	return DIV_ROUND_UP(*parent_rate, div);
 }
 
 static int
@@ -384,7 +384,7 @@ ingenic_clk_set_rate(struct clk_hw *hw, unsigned long req_rate,
 
 	if (clk_info->type & CGU_CLK_DIV) {
 		div = ingenic_clk_calc_div(clk_info, parent_rate, req_rate);
-		rate = parent_rate / div;
+		rate = DIV_ROUND_UP(parent_rate, div);
 
 		if (rate != req_rate)
 			return -EINVAL;
drivers/clocksource/exynos_mct.c +12 -11
index 47f8aafe3344..d65a6036d610 100644
@@ -379,6 +379,13 @@ static void exynos4_mct_tick_start(unsigned long cycles,
 	exynos4_mct_write(tmp, mevt->base + MCT_L_TCON_OFFSET);
 }
 
+static void exynos4_mct_tick_clear(struct mct_clock_event_device *mevt)
+{
+	/* Clear the MCT tick interrupt */
+	if (readl_relaxed(reg_base + mevt->base + MCT_L_INT_CSTAT_OFFSET) & 1)
+		exynos4_mct_write(0x1, mevt->base + MCT_L_INT_CSTAT_OFFSET);
+}
+
 static int exynos4_tick_set_next_event(unsigned long cycles,
 				       struct clock_event_device *evt)
 {
@@ -395,6 +402,7 @@ static int set_state_shutdown(struct clock_event_device *evt)
 
 	mevt = container_of(evt, struct mct_clock_event_device, evt);
 	exynos4_mct_tick_stop(mevt);
+	exynos4_mct_tick_clear(mevt);
 	return 0;
 }
 
@@ -411,8 +419,11 @@ static int set_state_periodic(struct clock_event_device *evt)
 	return 0;
 }
 
-static void exynos4_mct_tick_clear(struct mct_clock_event_device *mevt)
+static irqreturn_t exynos4_mct_tick_isr(int irq, void *dev_id)
 {
+	struct mct_clock_event_device *mevt = dev_id;
+	struct clock_event_device *evt = &mevt->evt;
+
 	/*
 	 * This is for supporting oneshot mode.
 	 * Mct would generate interrupt periodically
@@ -421,16 +432,6 @@ static void exynos4_mct_tick_clear(struct mct_clock_event_device *mevt)
 	if (!clockevent_state_periodic(&mevt->evt))
 		exynos4_mct_tick_stop(mevt);
 
-	/* Clear the MCT tick interrupt */
-	if (readl_relaxed(reg_base + mevt->base + MCT_L_INT_CSTAT_OFFSET) & 1)
-		exynos4_mct_write(0x1, mevt->base + MCT_L_INT_CSTAT_OFFSET);
-}
-
-static irqreturn_t exynos4_mct_tick_isr(int irq, void *dev_id)
-{
-	struct mct_clock_event_device *mevt = dev_id;
-	struct clock_event_device *evt = &mevt->evt;
-
 	exynos4_mct_tick_clear(mevt);
 
 	evt->event_handler(evt);
drivers/cpufreq/cpufreq.c +3 -3
index 68b604ad8413..205df72ee873 100644
@@ -474,13 +474,13 @@ EXPORT_SYMBOL_GPL(cpufreq_freq_transition_end);
  *                          SYSFS INTERFACE                          *
  *********************************************************************/
 static ssize_t show_boost(struct kobject *kobj,
-				 struct attribute *attr, char *buf)
+			  struct kobj_attribute *attr, char *buf)
 {
 	return sprintf(buf, "%d\n", cpufreq_driver->boost_enabled);
 }
 
-static ssize_t store_boost(struct kobject *kobj, struct attribute *attr,
-				  const char *buf, size_t count)
+static ssize_t store_boost(struct kobject *kobj, struct kobj_attribute *attr,
+			   const char *buf, size_t count)
 {
 	int ret, enable;
 
drivers/cpufreq/cpufreq_governor.h +5 -5
index 5621bb03e874..f7b340c27ff2 100644
@@ -48,11 +48,11 @@ enum {OD_NORMAL_SAMPLE, OD_SUB_SAMPLE};
 
 /* Create attributes */
 #define gov_sys_attr_ro(_name)						\
-static struct global_attr _name##_gov_sys =				\
+static struct kobj_attribute _name##_gov_sys =				\
 __ATTR(_name, 0444, show_##_name##_gov_sys, NULL)
 
 #define gov_sys_attr_rw(_name)						\
-static struct global_attr _name##_gov_sys =				\
+static struct kobj_attribute _name##_gov_sys =				\
 __ATTR(_name, 0644, show_##_name##_gov_sys, store_##_name##_gov_sys)
 
 #define gov_pol_attr_ro(_name)						\
@@ -74,7 +74,7 @@ __ATTR(_name, 0644, show_##_name##_gov_pol, store_##_name##_gov_pol)
 /* Create show/store routines */
 #define show_one(_gov, file_name)					\
 static ssize_t show_##file_name##_gov_sys				\
-(struct kobject *kobj, struct attribute *attr, char *buf)		\
+(struct kobject *kobj, struct kobj_attribute *attr, char *buf)		\
 {									\
 	struct _gov##_dbs_tuners *tuners = _gov##_dbs_cdata.gdbs_data->tuners; \
 	return sprintf(buf, "%u\n", tuners->file_name);			\
@@ -90,7 +90,7 @@ static ssize_t show_##file_name##_gov_pol				\
 
 #define store_one(_gov, file_name)					\
 static ssize_t store_##file_name##_gov_sys				\
-(struct kobject *kobj, struct attribute *attr, const char *buf, size_t count) \
+(struct kobject *kobj, struct kobj_attribute *attr, const char *buf, size_t count) \
 {									\
 	struct dbs_data *dbs_data = _gov##_dbs_cdata.gdbs_data;		\
 	return store_##file_name(dbs_data, buf, count);			\
@@ -254,7 +254,7 @@ static inline int delay_for_sampling_rate(unsigned int sampling_rate)
 
 #define declare_show_sampling_rate_min(_gov)				\
 static ssize_t show_sampling_rate_min_gov_sys				\
-(struct kobject *kobj, struct attribute *attr, char *buf)		\
+(struct kobject *kobj, struct kobj_attribute *attr, char *buf)		\
 {									\
 	struct dbs_data *dbs_data = _gov##_dbs_cdata.gdbs_data;		\
 	return sprintf(buf, "%u\n", dbs_data->min_sampling_rate);	\
drivers/cpufreq/intel_pstate.c +7 -7
index 88728d997088..15fcf2cac971 100644
@@ -368,13 +368,13 @@ static void __init intel_pstate_debug_expose_params(void)
 /************************** sysfs begin ************************/
 #define show_one(file_name, object)					\
 	static ssize_t show_##file_name					\
-	(struct kobject *kobj, struct attribute *attr, char *buf)	\
+	(struct kobject *kobj, struct kobj_attribute *attr, char *buf)	\
 	{								\
 		return sprintf(buf, "%u\n", limits->object);		\
 	}
 
 static ssize_t show_turbo_pct(struct kobject *kobj,
-				struct attribute *attr, char *buf)
+				struct kobj_attribute *attr, char *buf)
 {
 	struct cpudata *cpu;
 	int total, no_turbo, turbo_pct;
@@ -390,7 +390,7 @@ static ssize_t show_turbo_pct(struct kobject *kobj,
 }
 
 static ssize_t show_num_pstates(struct kobject *kobj,
-				struct attribute *attr, char *buf)
+				struct kobj_attribute *attr, char *buf)
 {
 	struct cpudata *cpu;
 	int total;
@@ -401,7 +401,7 @@ static ssize_t show_num_pstates(struct kobject *kobj,
 }
 
 static ssize_t show_no_turbo(struct kobject *kobj,
-			     struct attribute *attr, char *buf)
+			     struct kobj_attribute *attr, char *buf)
 {
 	ssize_t ret;
 
@@ -414,7 +414,7 @@ static ssize_t show_no_turbo(struct kobject *kobj,
 	return ret;
 }
 
-static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,
+static ssize_t store_no_turbo(struct kobject *a, struct kobj_attribute *b,
 			      const char *buf, size_t count)
 {
 	unsigned int input;
@@ -438,7 +438,7 @@ static ssize_t store_no_turbo(struct kobject *a, struct attribute *b,
 	return count;
 }
 
-static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,
+static ssize_t store_max_perf_pct(struct kobject *a, struct kobj_attribute *b,
 				  const char *buf, size_t count)
 {
 	unsigned int input;
@@ -463,7 +463,7 @@ static ssize_t store_max_perf_pct(struct kobject *a, struct attribute *b,
 	return count;
 }
 
-static ssize_t store_min_perf_pct(struct kobject *a, struct attribute *b,
+static ssize_t store_min_perf_pct(struct kobject *a, struct kobj_attribute *b,
 				  const char *buf, size_t count)
 {
 	unsigned int input;
drivers/cpufreq/pxa2xx-cpufreq.c +2 -2
index 096377232747..cd0333418d15 100644
@@ -191,7 +191,7 @@ static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq)
 	return ret;
 }
 
-static void __init pxa_cpufreq_init_voltages(void)
+static void pxa_cpufreq_init_voltages(void)
 {
 	vcc_core = regulator_get(NULL, "vcc_core");
 	if (IS_ERR(vcc_core)) {
@@ -207,7 +207,7 @@ static int pxa_cpufreq_change_voltage(const struct pxa_freqs *pxa_freq)
 	return 0;
 }
 
-static void __init pxa_cpufreq_init_voltages(void) { }
+static void pxa_cpufreq_init_voltages(void) { }
 #endif
 
 static void find_freq_tables(struct cpufreq_frequency_table **freq_table,
drivers/cpufreq/tegra124-cpufreq.c +2 -0
index 20bcceb58ccc..8e7deb65fc32 100644
@@ -141,6 +141,8 @@ static int tegra124_cpufreq_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, priv);
 
+	of_node_put(np);
+
 	return 0;
 
 out_switch_to_pllx:
drivers/crypto/caam/caamalg.c +1 -0
index f3307fc38e79..f2d1fea23fbf 100644
@@ -2081,6 +2081,7 @@ static void init_aead_job(struct aead_request *req,
 	if (unlikely(req->src != req->dst)) {
 		if (!edesc->dst_nents) {
 			dst_dma = sg_dma_address(req->dst);
+			out_options = 0;
 		} else {
 			dst_dma = edesc->sec4_sg_dma +
 				  sec4_sg_index *
drivers/dma/at_xdmac.c +10 -9
index 82a7c89caae2..af24c5bf32d6 100644
@@ -203,6 +203,7 @@ struct at_xdmac_chan {
 	u32				save_cim;
 	u32				save_cnda;
 	u32				save_cndc;
+	u32				irq_status;
 	unsigned long			status;
 	struct tasklet_struct		tasklet;
 	struct dma_slave_config		sconfig;
@@ -1582,8 +1583,8 @@ static void at_xdmac_tasklet(unsigned long data)
 	struct at_xdmac_desc	*desc;
 	u32			error_mask;
 
-	dev_dbg(chan2dev(&atchan->chan), "%s: status=0x%08lx\n",
-		 __func__, atchan->status);
+	dev_dbg(chan2dev(&atchan->chan), "%s: status=0x%08x\n",
+		__func__, atchan->irq_status);
 
 	error_mask = AT_XDMAC_CIS_RBEIS
 		     | AT_XDMAC_CIS_WBEIS
@@ -1591,15 +1592,15 @@ static void at_xdmac_tasklet(unsigned long data)
 
 	if (at_xdmac_chan_is_cyclic(atchan)) {
 		at_xdmac_handle_cyclic(atchan);
-	} else if ((atchan->status & AT_XDMAC_CIS_LIS)
-		   || (atchan->status & error_mask)) {
+	} else if ((atchan->irq_status & AT_XDMAC_CIS_LIS)
+		   || (atchan->irq_status & error_mask)) {
 		struct dma_async_tx_descriptor  *txd;
 
-		if (atchan->status & AT_XDMAC_CIS_RBEIS)
+		if (atchan->irq_status & AT_XDMAC_CIS_RBEIS)
 			dev_err(chan2dev(&atchan->chan), "read bus error!!!");
-		if (atchan->status & AT_XDMAC_CIS_WBEIS)
+		if (atchan->irq_status & AT_XDMAC_CIS_WBEIS)
 			dev_err(chan2dev(&atchan->chan), "write bus error!!!");
-		if (atchan->status & AT_XDMAC_CIS_ROIS)
+		if (atchan->irq_status & AT_XDMAC_CIS_ROIS)
 			dev_err(chan2dev(&atchan->chan), "request overflow error!!!");
 
 		spin_lock_bh(&atchan->lock);
@@ -1654,7 +1655,7 @@ static irqreturn_t at_xdmac_interrupt(int irq, void *dev_id)
 			atchan = &atxdmac->chan[i];
 			chan_imr = at_xdmac_chan_read(atchan, AT_XDMAC_CIM);
 			chan_status = at_xdmac_chan_read(atchan, AT_XDMAC_CIS);
-			atchan->status = chan_status & chan_imr;
+			atchan->irq_status = chan_status & chan_imr;
 			dev_vdbg(atxdmac->dma.dev,
 				 "%s: chan%d: imr=0x%x, status=0x%x\n",
 				 __func__, i, chan_imr, chan_status);
@@ -1668,7 +1669,7 @@ static irqreturn_t at_xdmac_interrupt(int irq, void *dev_id)
 				 at_xdmac_chan_read(atchan, AT_XDMAC_CDA),
 				 at_xdmac_chan_read(atchan, AT_XDMAC_CUBC));
 
-			if (atchan->status & (AT_XDMAC_CIS_RBEIS | AT_XDMAC_CIS_WBEIS))
+			if (atchan->irq_status & (AT_XDMAC_CIS_RBEIS | AT_XDMAC_CIS_WBEIS))
 				at_xdmac_write(atxdmac, AT_XDMAC_GD, atchan->mask);
 
 			tasklet_schedule(&atchan->tasklet);
drivers/dma/dmatest.c +12 -16
index 6796eb1a8a4c..884aecebb249 100644
@@ -563,11 +563,9 @@ static int dmatest_func(void *data)
 			srcs[i] = um->addr[i] + src_off;
 			ret = dma_mapping_error(dev->dev, um->addr[i]);
 			if (ret) {
-				dmaengine_unmap_put(um);
 				result("src mapping error", total_tests,
 				       src_off, dst_off, len, ret);
-				failed_tests++;
-				continue;
+				goto error_unmap_continue;
 			}
 			um->to_cnt++;
 		}
@@ -582,11 +580,9 @@ static int dmatest_func(void *data)
 					       DMA_BIDIRECTIONAL);
 			ret = dma_mapping_error(dev->dev, dsts[i]);
 			if (ret) {
-				dmaengine_unmap_put(um);
 				result("dst mapping error", total_tests,
 				       src_off, dst_off, len, ret);
-				failed_tests++;
-				continue;
+				goto error_unmap_continue;
 			}
 			um->bidi_cnt++;
 		}
@@ -611,12 +607,10 @@ static int dmatest_func(void *data)
 		}
 
 		if (!tx) {
-			dmaengine_unmap_put(um);
 			result("prep error", total_tests, src_off,
 			       dst_off, len, ret);
 			msleep(100);
-			failed_tests++;
-			continue;
+			goto error_unmap_continue;
 		}
 
 		done->done = false;
@@ -625,12 +619,10 @@ static int dmatest_func(void *data)
 		cookie = tx->tx_submit(tx);
 
 		if (dma_submit_error(cookie)) {
-			dmaengine_unmap_put(um);
 			result("submit error", total_tests, src_off,
 			       dst_off, len, ret);
 			msleep(100);
-			failed_tests++;
-			continue;
+			goto error_unmap_continue;
 		}
 		dma_async_issue_pending(chan);
 
@@ -643,16 +635,14 @@ static int dmatest_func(void *data)
 			dmaengine_unmap_put(um);
 			result("test timed out", total_tests, src_off, dst_off,
 			       len, 0);
-			failed_tests++;
-			continue;
+			goto error_unmap_continue;
 		} else if (status != DMA_COMPLETE) {
 			dmaengine_unmap_put(um);
 			result(status == DMA_ERROR ?
 			       "completion error status" :
 			       "completion busy status", total_tests, src_off,
 			       dst_off, len, ret);
-			failed_tests++;
-			continue;
+			goto error_unmap_continue;
 		}
 
 		dmaengine_unmap_put(um);
@@ -691,6 +681,12 @@ static int dmatest_func(void *data)
 			verbose_result("test passed", total_tests, src_off,
 				       dst_off, len, 0);
 		}
+
+		continue;
+
+error_unmap_continue:
+		dmaengine_unmap_put(um);
+		failed_tests++;
 	}
 	runtime = ktime_us_delta(ktime_get(), ktime);
 
drivers/dma/sh/usb-dmac.c +2 -0
index 6682b3eec2b6..cc8fc601ed47 100644
@@ -700,6 +700,8 @@ static int usb_dmac_runtime_resume(struct device *dev)
 #endif /* CONFIG_PM */
 
 static const struct dev_pm_ops usb_dmac_pm = {
+	SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,
+				      pm_runtime_force_resume)
 	SET_RUNTIME_PM_OPS(usb_dmac_runtime_suspend, usb_dmac_runtime_resume,
 			   NULL)
 };
drivers/firmware/efi/runtime-wrappers.c +0 -7
index 906d0224f50d..228bbf910461 100644
@@ -87,13 +87,6 @@ static DEFINE_SPINLOCK(efi_runtime_lock);
  * context through efi_pstore_write().
  */
 
-/*
- * Expose the EFI runtime lock to the UV platform
- */
-#ifdef CONFIG_X86_UV
-extern struct semaphore __efi_uv_runtime_lock __alias(efi_runtime_lock);
-#endif
-
 /*
  * As per commit ef68c8f87ed1 ("x86: Serialize EFI time accesses on rtc_lock"),
  * the EFI specification requires that callers of the time related runtime
drivers/firmware/iscsi_ibft.c +1 -0
index 72791232e46b..437c8ef90643 100644
@@ -513,6 +513,7 @@ static umode_t __init ibft_check_tgt_for(void *data, int type)
 	case ISCSI_BOOT_TGT_NIC_ASSOC:
 	case ISCSI_BOOT_TGT_CHAP_TYPE:
 		rc = S_IRUGO;
+		break;
 	case ISCSI_BOOT_TGT_NAME:
 		if (tgt->tgt_name_len)
 			rc = S_IRUGO;
drivers/gpio/gpio-vf610.c +5 -0
index 87b950cec6ec..db95c4b99a74 100644
@@ -227,6 +227,7 @@ static int vf610_gpio_probe(struct platform_device *pdev)
 	struct vf610_gpio_port *port;
 	struct resource *iores;
 	struct gpio_chip *gc;
+	int i;
 	int ret;
 
 	port = devm_kzalloc(&pdev->dev, sizeof(*port), GFP_KERNEL);
@@ -265,6 +266,10 @@ static int vf610_gpio_probe(struct platform_device *pdev)
 	if (ret < 0)
 		return ret;
 
+	/* Mask all GPIO interrupts */
+	for (i = 0; i < gc->ngpio; i++)
+		vf610_gpio_writel(0, port->base + PORT_PCR(i));
+
 	/* Clear the interrupt status register for all GPIO's */
 	vf610_gpio_writel(~0, port->base + PORT_ISFR);
 
drivers/gpu/drm/msm/msm_rd.c +6 -1
index 9a78c48817c6..909a52b21ebe 100644
@@ -103,7 +103,9 @@ static void rd_write(struct msm_rd_state *rd, const void *buf, int sz)
 		char *fptr = &fifo->buf[fifo->head];
 		int n;
 
-		wait_event(rd->fifo_event, circ_space(&rd->fifo) > 0);
+		wait_event(rd->fifo_event, circ_space(&rd->fifo) > 0 || !rd->open);
+		if (!rd->open)
+			return;
 
 		n = min(sz, circ_space_to_end(&rd->fifo));
 		memcpy(fptr, ptr, n);
@@ -192,7 +194,10 @@ out:
 static int rd_release(struct inode *inode, struct file *file)
 {
 	struct msm_rd_state *rd = inode->i_private;
+
 	rd->open = false;
+	wake_up_all(&rd->fifo_event);
+
 	return 0;
 }
 
drivers/gpu/drm/radeon/evergreen_cs.c +1 -0
index 46f87d4aaf31..782fee330b4c 100644
@@ -1299,6 +1299,7 @@ static int evergreen_cs_handle_reg(struct radeon_cs_parser *p, u32 reg, u32 idx)
 			return -EINVAL;
 		}
 		ib[idx] += (u32)((reloc->gpu_offset >> 8) & 0xffffffff);
+		break;
 	case CB_TARGET_MASK:
 		track->cb_target_mask = radeon_get_ib_value(p, idx);
 		track->cb_dirty = true;
drivers/gpu/ipu-v3/ipu-common.c +4 -4
index 5030cba4a581..df295a0ce87d 100644
@@ -746,8 +746,8 @@ static struct ipu_devtype ipu_type_imx51 = {
 	.cpmem_ofs = 0x1f000000,
 	.srm_ofs = 0x1f040000,
 	.tpm_ofs = 0x1f060000,
-	.csi0_ofs = 0x1f030000,
-	.csi1_ofs = 0x1f038000,
+	.csi0_ofs = 0x1e030000,
+	.csi1_ofs = 0x1e038000,
 	.ic_ofs = 0x1e020000,
 	.disp0_ofs = 0x1e040000,
 	.disp1_ofs = 0x1e048000,
@@ -762,8 +762,8 @@ static struct ipu_devtype ipu_type_imx53 = {
 	.cpmem_ofs = 0x07000000,
 	.srm_ofs = 0x07040000,
 	.tpm_ofs = 0x07060000,
-	.csi0_ofs = 0x07030000,
-	.csi1_ofs = 0x07038000,
+	.csi0_ofs = 0x06030000,
+	.csi1_ofs = 0x06038000,
 	.ic_ofs = 0x06020000,
 	.disp0_ofs = 0x06040000,
 	.disp1_ofs = 0x06048000,
drivers/hwtracing/intel_th/gth.c +4 -0
index 2dc5378ccd3a..eb43943cdf07 100644
@@ -591,11 +591,15 @@ static void intel_th_gth_unassign(struct intel_th_device *thdev,
 {
 	struct gth_device *gth = dev_get_drvdata(&thdev->dev);
 	int port = othdev->output.port;
+	int master;
 
 	spin_lock(&gth->gth_lock);
 	othdev->output.port = -1;
 	othdev->output.active = false;
 	gth->output[port].output = NULL;
+	for (master = 0; master < TH_CONFIGURABLE_MASTERS; master++)
+		if (gth->master[master] == port)
+			gth->master[master] = -1;
 	spin_unlock(&gth->gth_lock);
 }
 
drivers/hwtracing/stm/core.c +8 -3
index 99434f5be34c..92ab51aa8a74 100644
@@ -229,6 +229,9 @@ static int find_free_channels(unsigned long *bitmap, unsigned int start,
 			;
 		if (i == width)
 			return pos;
+
+		/* step over [pos..pos+i) to continue search */
+		pos += i;
 	}
 
 	return -1;
@@ -474,7 +477,7 @@ static int stm_char_policy_set_ioctl(struct stm_file *stmf, void __user *arg)
 {
 	struct stm_device *stm = stmf->stm;
 	struct stp_policy_id *id;
-	int ret = -EINVAL;
+	int ret = -EINVAL, wlimit = 1;
 	u32 size;
 
 	if (stmf->output.nr_chans)
@@ -502,8 +505,10 @@ static int stm_char_policy_set_ioctl(struct stm_file *stmf, void __user *arg)
 	if (id->__reserved_0 || id->__reserved_1)
 		goto err_free;
 
-	if (id->width < 1 ||
-	    id->width > PAGE_SIZE / stm->data->sw_mmiosz)
+	if (stm->data->sw_mmiosz)
+		wlimit = PAGE_SIZE / stm->data->sw_mmiosz;
+
+	if (id->width < 1 || id->width > wlimit)
 		goto err_free;
 
 	ret = stm_file_assign(stmf, id->id, id->width);
drivers/i2c/busses/i2c-cadence.c +7 -2
index 84deed6571bd..6d32e6da3110 100644
@@ -378,8 +378,10 @@ static void cdns_i2c_mrecv(struct cdns_i2c *id)
 	 * Check for the message size against FIFO depth and set the
 	 * 'hold bus' bit if it is greater than FIFO depth.
 	 */
-	if (id->recv_count > CDNS_I2C_FIFO_DEPTH)
+	if ((id->recv_count > CDNS_I2C_FIFO_DEPTH)  || id->bus_hold_flag)
 		ctrl_reg |= CDNS_I2C_CR_HOLD;
+	else
+		ctrl_reg = ctrl_reg & ~CDNS_I2C_CR_HOLD;
 
 	cdns_i2c_writereg(ctrl_reg, CDNS_I2C_CR_OFFSET);
 
@@ -436,8 +438,11 @@ static void cdns_i2c_msend(struct cdns_i2c *id)
 	 * Check for the message size against FIFO depth and set the
 	 * 'hold bus' bit if it is greater than FIFO depth.
 	 */
-	if (id->send_count > CDNS_I2C_FIFO_DEPTH)
+	if ((id->send_count > CDNS_I2C_FIFO_DEPTH) || id->bus_hold_flag)
 		ctrl_reg |= CDNS_I2C_CR_HOLD;
+	else
+		ctrl_reg = ctrl_reg & ~CDNS_I2C_CR_HOLD;
+
 	cdns_i2c_writereg(ctrl_reg, CDNS_I2C_CR_OFFSET);
 
 	/* Clear the interrupts in interrupt status register. */
drivers/i2c/busses/i2c-tegra.c +1 -1
index a0522fcc4ff8..1004422dbb10 100644
@@ -696,7 +696,7 @@ static const struct i2c_algorithm tegra_i2c_algo = {
 /* payload size is only 12 bit */
 static struct i2c_adapter_quirks tegra_i2c_quirks = {
 	.max_read_len = 4096,
-	.max_write_len = 4096,
+	.max_write_len = 4096 - 12,
 };
 
 static const struct tegra_i2c_hw_feature tegra20_i2c_hw = {
drivers/infiniband/hw/qib/qib_ud.c +0 -1
index 59193f67ea78..56bd59bc08b5 100644
@@ -515,7 +515,6 @@ void qib_ud_rcv(struct qib_ibport *ibp, struct qib_ib_header *hdr,
 	    opcode == IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE) {
 		wc.ex.imm_data = ohdr->u.ud.imm_data;
 		wc.wc_flags = IB_WC_WITH_IMM;
-		tlen -= sizeof(u32);
 	} else if (opcode == IB_OPCODE_UD_SEND_ONLY) {
 		wc.ex.imm_data = 0;
 		wc.wc_flags = 0;
drivers/infiniband/ulp/srp/ib_srp.c +0 -10
index 1897c4080346..3dbc3ed263c2 100644
@@ -2594,7 +2594,6 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)
 {
 	struct srp_target_port *target = host_to_target(scmnd->device->host);
 	struct srp_rdma_ch *ch;
-	int i, j;
 	u8 status;
 
 	shost_printk(KERN_ERR, target->scsi_host, "SRP reset_device called\n");
@@ -2606,15 +2605,6 @@ static int srp_reset_device(struct scsi_cmnd *scmnd)
 	if (status)
 		return FAILED;
 
-	for (i = 0; i < target->ch_count; i++) {
-		ch = &target->ch[i];
-		for (j = 0; j < target->req_ring_size; ++j) {
-			struct srp_request *req = &ch->req_ring[j];
-
-			srp_finish_req(ch, req, scmnd->device, DID_RESET << 16);
-		}
-	}
-
 	return SUCCESS;
 }
 
drivers/input/keyboard/matrix_keypad.c +1 -1
index c64d87442a62..2e12e31f45c5 100644
@@ -220,7 +220,7 @@ static void matrix_keypad_stop(struct input_dev *dev)
 	keypad->stopped = true;
 	spin_unlock_irq(&keypad->lock);
 
-	flush_work(&keypad->work.work);
+	flush_delayed_work(&keypad->work);
 	/*
 	 * matrix_keypad_scan() will leave IRQs enabled;
 	 * we should disable them now.
drivers/input/keyboard/st-keyscan.c +2 -2
index de7be4f03d91..ebf9f643d910 100644
@@ -153,6 +153,8 @@ static int keyscan_probe(struct platform_device *pdev)
 
 	input_dev->id.bustype = BUS_HOST;
 
+	keypad_data->input_dev = input_dev;
+
 	error = keypad_matrix_key_parse_dt(keypad_data);
 	if (error)
 		return error;
@@ -168,8 +170,6 @@ static int keyscan_probe(struct platform_device *pdev)
 
 	input_set_drvdata(input_dev, keypad_data);
 
-	keypad_data->input_dev = input_dev;
-
 	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 	keypad_data->base = devm_ioremap_resource(&pdev->dev, res);
 	if (IS_ERR(keypad_data->base))
drivers/input/mouse/elan_i2c_core.c +1 -0
index 25ce9047b682..16f5d5660053 100644
@@ -1241,6 +1241,7 @@ static const struct acpi_device_id elan_acpi_id[] = {
 	{ "ELAN0000", 0 },
 	{ "ELAN0100", 0 },
 	{ "ELAN0600", 0 },
+	{ "ELAN0601", 0 },
 	{ "ELAN0602", 0 },
 	{ "ELAN0605", 0 },
 	{ "ELAN0608", 0 },
drivers/input/tablet/wacom_serial4.c +2 -0
index 20ab802461e7..1d46b763aae6 100644
@@ -187,6 +187,7 @@ enum {
 	MODEL_DIGITIZER_II	= 0x5544, /* UD */
 	MODEL_GRAPHIRE		= 0x4554, /* ET */
 	MODEL_PENPARTNER	= 0x4354, /* CT */
+	MODEL_ARTPAD_II		= 0x4B54, /* KT */
 };
 
 static void wacom_handle_model_response(struct wacom *wacom)
@@ -245,6 +246,7 @@ static void wacom_handle_model_response(struct wacom *wacom)
 		wacom->flags = F_HAS_STYLUS2 | F_HAS_SCROLLWHEEL;
 		break;
 
+	case MODEL_ARTPAD_II:
 	case MODEL_DIGITIZER_II:
 		wacom->dev->name = "Wacom Digitizer II";
 		wacom->dev->id.version = MODEL_DIGITIZER_II;
drivers/iommu/amd_iommu.c +11 -4
index 52c36394dba5..0ad8b7c78a43 100644
@@ -1982,6 +1982,7 @@ static void do_attach(struct iommu_dev_data *dev_data,
 
 static void do_detach(struct iommu_dev_data *dev_data)
 {
+	struct protection_domain *domain = dev_data->domain;
 	struct amd_iommu *iommu;
 	u16 alias;
 
@@ -1997,10 +1998,6 @@ static void do_detach(struct iommu_dev_data *dev_data)
 	iommu = amd_iommu_rlookup_table[dev_data->devid];
 	alias = dev_data->alias;
 
-	/* decrease reference counters */
-	dev_data->domain->dev_iommu[iommu->index] -= 1;
-	dev_data->domain->dev_cnt                 -= 1;
-
 	/* Update data structures */
 	dev_data->domain = NULL;
 	list_del(&dev_data->list);
@@ -2010,6 +2007,16 @@ static void do_detach(struct iommu_dev_data *dev_data)
 
 	/* Flush the DTE entry */
 	device_flush_dte(dev_data);
+
+	/* Flush IOTLB */
+	domain_flush_tlb_pde(domain);
+
+	/* Wait for the flushes to finish */
+	domain_flush_complete(domain);
+
+	/* decrease reference counters - needs to happen after the flushes */
+	domain->dev_iommu[iommu->index] -= 1;
+	domain->dev_cnt                 -= 1;
 }
 
 /*
drivers/irqchip/irq-mmp.c +5 -1
index 013fc9659a84..2fe2bcb63a71 100644
@@ -34,6 +34,9 @@
 #define SEL_INT_PENDING		(1 << 6)
 #define SEL_INT_NUM_MASK	0x3f
 
+#define MMP2_ICU_INT_ROUTE_PJ4_IRQ	(1 << 5)
+#define MMP2_ICU_INT_ROUTE_PJ4_FIQ	(1 << 6)
+
 struct icu_chip_data {
 	int			nr_irqs;
 	unsigned int		virq_base;
@@ -190,7 +193,8 @@ static struct mmp_intc_conf mmp_conf = {
 static struct mmp_intc_conf mmp2_conf = {
 	.conf_enable	= 0x20,
 	.conf_disable	= 0x0,
-	.conf_mask	= 0x7f,
+	.conf_mask	= MMP2_ICU_INT_ROUTE_PJ4_IRQ |
+			  MMP2_ICU_INT_ROUTE_PJ4_FIQ,
 };
 
 static void __exception_irq_entry mmp_handle_irq(struct pt_regs *regs)
drivers/isdn/hardware/avm/b1.c +1 -1
index 4d9b195547c5..df2a10157720 100644
@@ -423,7 +423,7 @@ void b1_parse_version(avmctrl_info *cinfo)
 	int i, j;
 
 	for (j = 0; j < AVM_MAXVERSION; j++)
-		cinfo->version[j] = "\0\0" + 1;
+		cinfo->version[j] = "";
 	for (i = 0, j = 0;
 	     j < AVM_MAXVERSION && i < cinfo->versionlen;
 	     j++, i += cinfo->versionbuf[i] + 1)
drivers/isdn/i4l/isdn_tty.c +6 -2
index 2175225af742..2da3f5cd0729 100644
@@ -786,7 +786,7 @@ isdn_tty_suspend(char *id, modem_info *info, atemu *m)
 		cmd.parm.cmsg.para[3] = 4; /* 16 bit 0x0004 Suspend */
 		cmd.parm.cmsg.para[4] = 0;
 		cmd.parm.cmsg.para[5] = l;
-		strncpy(&cmd.parm.cmsg.para[6], id, l);
+		strscpy(&cmd.parm.cmsg.para[6], id, l);
 		cmd.command = CAPI_PUT_MESSAGE;
 		cmd.driver = info->isdn_driver;
 		cmd.arg = info->isdn_channel;
@@ -1459,15 +1459,19 @@ isdn_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios)
 {
 	modem_info *info = (modem_info *) tty->driver_data;
 
+	mutex_lock(&modem_info_mutex);
 	if (!old_termios)
 		isdn_tty_change_speed(info);
 	else {
 		if (tty->termios.c_cflag == old_termios->c_cflag &&
 		    tty->termios.c_ispeed == old_termios->c_ispeed &&
-		    tty->termios.c_ospeed == old_termios->c_ospeed)
+		    tty->termios.c_ospeed == old_termios->c_ospeed) {
+			mutex_unlock(&modem_info_mutex);
 			return;
+		}
 		isdn_tty_change_speed(info);
 	}
+	mutex_unlock(&modem_info_mutex);
 }
 
 /*
drivers/leds/leds-lp5523.c +3 -1
index 1d0187f42941..d12370352ae3 100644
@@ -318,7 +318,9 @@ static int lp5523_init_program_engine(struct lp55xx_chip *chip)
 
 	/* Let the programs run for couple of ms and check the engine status */
 	usleep_range(3000, 6000);
-	lp55xx_read(chip, LP5523_REG_STATUS, &status);
+	ret = lp55xx_read(chip, LP5523_REG_STATUS, &status);
+	if (ret)
+		return ret;
 	status &= LP5523_ENG_STATUS_MASK;
 
 	if (status != LP5523_ENG_STATUS_MASK) {
drivers/md/raid10.c +2 -1
index 8d613652d0e2..69e9abf00c74 100644
@@ -3755,6 +3755,8 @@ static int run(struct mddev *mddev)
 		set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
 		mddev->sync_thread = md_register_thread(md_do_sync, mddev,
 							"reshape");
+		if (!mddev->sync_thread)
+			goto out_free_conf;
 	}
 
 	return 0;
@@ -4442,7 +4444,6 @@ bio_full:
 	atomic_inc(&r10_bio->remaining);
 	read_bio->bi_next = NULL;
 	generic_make_request(read_bio);
-	sector_nr += nr_sectors;
 	sectors_done += nr_sectors;
 	if (sector_nr <= last)
 		goto read_more;
drivers/md/raid5.c +2 -0
index 0841d8f10a58..5e65dc6def7e 100644
@@ -6973,6 +6973,8 @@ static int run(struct mddev *mddev)
 		set_bit(MD_RECOVERY_RUNNING, &mddev->recovery);
 		mddev->sync_thread = md_register_thread(md_do_sync, mddev,
 							"reshape");
+		if (!mddev->sync_thread)
+			goto abort;
 	}
 
 	/* Ok, everything is just fine now */
drivers/media/usb/uvc/uvc_driver.c +11 -3
index 885f689ac870..f2e3fdf385cc 100644
@@ -1019,11 +1019,19 @@ static int uvc_parse_standard_control(struct uvc_device *dev,
 			return -EINVAL;
 		}
 
-		/* Make sure the terminal type MSB is not null, otherwise it
-		 * could be confused with a unit.
+		/*
+		 * Reject invalid terminal types that would cause issues:
+		 *
+		 * - The high byte must be non-zero, otherwise it would be
+		 *   confused with a unit.
+		 *
+		 * - Bit 15 must be 0, as we use it internally as a terminal
+		 *   direction flag.
+		 *
+		 * Other unknown types are accepted.
 		 */
 		type = get_unaligned_le16(&buffer[4]);
-		if ((type & 0xff00) == 0) {
+		if ((type & 0x7f00) == 0 || (type & 0x8000) != 0) {
 			uvc_trace(UVC_TRACE_DESCR, "device %d videocontrol "
 				"interface %d INPUT_TERMINAL %d has invalid "
 				"type 0x%04x, skipping\n", udev->devnum,
drivers/media/usb/uvc/uvc_video.c +8 -0
index a4048a04d236..a550dbe36dc5 100644
@@ -638,6 +638,14 @@ void uvc_video_clock_update(struct uvc_streaming *stream,
 	if (!uvc_hw_timestamps_param)
 		return;
 
+	/*
+	 * We will get called from __vb2_queue_cancel() if there are buffers
+	 * done but not dequeued by the user, but the sample array has already
+	 * been released at that time. Just bail out in that case.
+	 */
+	if (!clock->samples)
+		return;
+
 	spin_lock_irqsave(&clock->lock, flags);
 
 	if (clock->count < clock->size)
drivers/media/v4l2-core/videobuf2-v4l2.c +0 -1
index bf23234d957e..412a6a74d0a8 100644
@@ -141,7 +141,6 @@ static void vb2_warn_zero_bytesused(struct vb2_buffer *vb)
 		return;
 
 	check_once = true;
-	WARN_ON(1);
 
 	pr_warn("use of bytesused == 0 is deprecated and will be removed in the future,\n");
 	if (vb->vb2_queue->allow_zero_bytesused)
drivers/mfd/ab8500-core.c +1 -1
index fefbe4cfa61d..1263cfd8b4d2 100644
@@ -259,7 +259,7 @@ static int get_register_interruptible(struct ab8500 *ab8500, u8 bank,
 	mutex_unlock(&ab8500->lock);
 	dev_vdbg(ab8500->dev, "rd: addr %#x => data %#x\n", addr, ret);
 
-	return ret;
+	return (ret < 0) ? ret : 0;
 }
 
 static int ab8500_get_register(struct device *dev, u8 bank,
drivers/mfd/db8500-prcmu.c +2 -2
index 12099b09a9a7..e71b9f23379d 100644
@@ -2610,7 +2610,7 @@ static struct irq_chip prcmu_irq_chip = {
 	.irq_unmask	= prcmu_irq_unmask,
 };
 
-static __init char *fw_project_name(u32 project)
+static char *fw_project_name(u32 project)
 {
 	switch (project) {
 	case PRCMU_FW_PROJECT_U8500:
@@ -2758,7 +2758,7 @@ void __init db8500_prcmu_early_init(u32 phy_base, u32 size)
 	INIT_WORK(&mb0_transfer.mask_work, prcmu_mask_work);
 }
 
-static void __init init_prcm_registers(void)
+static void init_prcm_registers(void)
 {
 	u32 val;
 
drivers/mfd/mc13xxx-core.c +3 -1
index 3f9f4c874d2a..8d74806b83c1 100644
@@ -274,7 +274,9 @@ int mc13xxx_adc_do_conversion(struct mc13xxx *mc13xxx, unsigned int mode,
 
 	mc13xxx->adcflags |= MC13XXX_ADC_WORKING;
 
-	mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0);
+	ret = mc13xxx_reg_read(mc13xxx, MC13XXX_ADC0, &old_adc0);
+	if (ret)
+		goto out;
 
 	adc0 = MC13XXX_ADC0_ADINC1 | MC13XXX_ADC0_ADINC2;
 	adc1 = MC13XXX_ADC1_ADEN | MC13XXX_ADC1_ADTRIGIGN | MC13XXX_ADC1_ASC;
drivers/mfd/qcom_rpm.c +4 -0
index a867cc91657e..27486f278201 100644
@@ -570,6 +570,10 @@ static int qcom_rpm_probe(struct platform_device *pdev)
 		return -EFAULT;
 	}
 
+	writel(fw_version[0], RPM_CTRL_REG(rpm, 0));
+	writel(fw_version[1], RPM_CTRL_REG(rpm, 1));
+	writel(fw_version[2], RPM_CTRL_REG(rpm, 2));
+
 	dev_info(&pdev->dev, "RPM firmware %u.%u.%u\n", fw_version[0],
 							fw_version[1],
 							fw_version[2]);
drivers/mfd/ti_am335x_tscadc.c +3 -2
index 4a0f076c91ba..faf8ce5be576 100644
@@ -279,8 +279,9 @@ static	int ti_tscadc_probe(struct platform_device *pdev)
 		cell->pdata_size = sizeof(tscadc);
 	}
 
-	err = mfd_add_devices(&pdev->dev, pdev->id, tscadc->cells,
-			tscadc->used_cells, NULL, 0, NULL);
+	err = mfd_add_devices(&pdev->dev, PLATFORM_DEVID_AUTO,
+			      tscadc->cells, tscadc->used_cells, NULL,
+			      0, NULL);
 	if (err < 0)
 		goto err_disable_clk;
 
drivers/mfd/twl-core.c +2 -2
index 831696ee2472..90732a655d57 100644
@@ -982,7 +982,7 @@ add_children(struct twl4030_platform_data *pdata, unsigned irq_base,
  * letting it generate the right frequencies for USB, MADC, and
  * other purposes.
  */
-static inline int __init protect_pm_master(void)
+static inline int protect_pm_master(void)
 {
 	int e = 0;
 
@@ -991,7 +991,7 @@ static inline int __init protect_pm_master(void)
 	return e;
 }
 
-static inline int __init unprotect_pm_master(void)
+static inline int unprotect_pm_master(void)
 {
 	int e = 0;
 
drivers/mfd/wm5110-tables.c +2 -0
index 2bb2d0467a92..c47efe6dcb01 100644
@@ -1622,6 +1622,7 @@ static const struct reg_default wm5110_reg_default[] = {
 	{ 0x00000ECD, 0x0000 },    /* R3789  - HPLPF4_2 */
 	{ 0x00000EE0, 0x0000 },    /* R3808  - ASRC_ENABLE */
 	{ 0x00000EE2, 0x0000 },    /* R3810  - ASRC_RATE1 */
+	{ 0x00000EE3, 0x4000 },    /* R3811  - ASRC_RATE2 */
 	{ 0x00000EF0, 0x0000 },    /* R3824  - ISRC 1 CTRL 1 */
 	{ 0x00000EF1, 0x0000 },    /* R3825  - ISRC 1 CTRL 2 */
 	{ 0x00000EF2, 0x0000 },    /* R3826  - ISRC 1 CTRL 3 */
@@ -2877,6 +2878,7 @@ static bool wm5110_readable_register(struct device *dev, unsigned int reg)
 	case ARIZONA_ASRC_ENABLE:
 	case ARIZONA_ASRC_STATUS:
 	case ARIZONA_ASRC_RATE1:
+	case ARIZONA_ASRC_RATE2:
 	case ARIZONA_ISRC_1_CTRL_1:
 	case ARIZONA_ISRC_1_CTRL_2:
 	case ARIZONA_ISRC_1_CTRL_3:
drivers/mmc/host/mmc_spi.c +1 -0
index aad3243a48fc..e03ec74f3fb0 100644
@@ -1451,6 +1451,7 @@ static int mmc_spi_probe(struct spi_device *spi)
 		if (status != 0)
 			goto fail_add_host;
 	}
+	mmc_detect_change(mmc, 0);
 
 	dev_info(&spi->dev, "SD/MMC host %s%s%s%s%s\n",
 			dev_name(&mmc->class_dev),
drivers/net/dsa/mv88e6xxx.c +1 -1
index 2dea39b5cb0b..e2414f2d7ba9 100644
@@ -712,7 +712,7 @@ static uint64_t _mv88e6xxx_get_ethtool_stat(struct dsa_switch *ds,
 		if (s->sizeof_stat == 8)
 			_mv88e6xxx_stats_read(ds, s->reg + 1, &high);
 	}
-	value = (((u64)high) << 16) | low;
+	value = (((u64)high) << 32) | low;
 	return value;
 }
 
drivers/net/ethernet/altera/altera_msgdma.c +2 -1
index 0fb986ba3290..0ae723f75341 100644
@@ -145,7 +145,8 @@ u32 msgdma_tx_completions(struct altera_tse_private *priv)
 			& 0xffff;
 
 	if (inuse) { /* Tx FIFO is not empty */
-		ready = priv->tx_prod - priv->tx_cons - inuse - 1;
+		ready = max_t(int,
+			      priv->tx_prod - priv->tx_cons - inuse - 1, 0);
 	} else {
 		/* Check for buffered last packet */
 		status = csrrd32(priv->tx_dma_csr, msgdma_csroffs(status));
drivers/net/ethernet/altera/altera_tse_main.c +3 -1
index fe644823ceaf..bb51f124d8c7 100644
@@ -716,8 +716,10 @@ static struct phy_device *connect_local_phy(struct net_device *dev)
 
 		phydev = phy_connect(dev, phy_id_fmt, &altera_tse_adjust_link,
 				     priv->phy_iface);
-		if (IS_ERR(phydev))
+		if (IS_ERR(phydev)) {
 			netdev_err(dev, "Could not attach to PHY\n");
+			phydev = NULL;
+		}
 
 	} else {
 		int ret;
drivers/net/ethernet/atheros/atlx/atl2.c +1 -3
index 2ff465848b65..097a0bf592ab 100644
@@ -1338,13 +1338,11 @@ static int atl2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	struct net_device *netdev;
 	struct atl2_adapter *adapter;
-	static int cards_found;
+	static int cards_found = 0;
 	unsigned long mmio_start;
 	int mmio_len;
 	int err;
 
-	cards_found = 0;
-
 	err = pci_enable_device(pdev);
 	if (err)
 		return err;
drivers/net/ethernet/broadcom/bcmsysport.c +4 -0
index 143b9a384af8..53b3c1a5851c 100644
@@ -126,6 +126,10 @@ static int bcm_sysport_set_rx_csum(struct net_device *dev,
 
 	priv->rx_chk_en = !!(wanted & NETIF_F_RXCSUM);
 	reg = rxchk_readl(priv, RXCHK_CONTROL);
+	/* Clear L2 header checks, which would prevent BPDUs
+	 * from being received.
+	 */
+	reg &= ~RXCHK_L2_HDR_DIS;
 	if (priv->rx_chk_en)
 		reg |= RXCHK_EN;
 	else
drivers/net/ethernet/broadcom/bnxt/bnxt.c +6 -0
index fea8116da06a..00bd7be85679 100644
@@ -330,6 +330,12 @@ normal_tx:
 	}
 
 	length >>= 9;
+	if (unlikely(length >= ARRAY_SIZE(bnxt_lhint_arr))) {
+		dev_warn_ratelimited(&pdev->dev, "Dropped oversize %d bytes TX packet.\n",
+				     skb->len);
+		i = 0;
+		goto tx_dma_error;
+	}
 	flags |= bnxt_lhint_arr[length];
 	txbd->tx_bd_len_flags_type = cpu_to_le32(flags);
 
drivers/net/ethernet/hisilicon/hns/hns_ae_adapt.c +2 -4
index 1a16c0307b47..bd36fbe81ad2 100644
@@ -188,12 +188,10 @@ static void hns_ae_put_handle(struct hnae_handle *handle)
 	struct hnae_vf_cb *vf_cb = hns_ae_get_vf_cb(handle);
 	int i;
 
-	vf_cb->mac_cb	 = NULL;
-
-	kfree(vf_cb);
-
 	for (i = 0; i < handle->q_num; i++)
 		hns_ae_get_ring_pair(handle->qs[i])->used_by_vf = 0;
+
+	kfree(vf_cb);
 }
 
 static void hns_ae_ring_enable_all(struct hnae_handle *handle, int val)
drivers/net/ethernet/hisilicon/hns_mdio.c +1 -1
index 37491c85bc42..6ff13c559e52 100644
@@ -319,7 +319,7 @@ static int hns_mdio_read(struct mii_bus *bus, int phy_id, int regnum)
 		}
 
 		hns_mdio_cmd_write(mdio_dev, is_c45,
-				   MDIO_C45_WRITE_ADDR, phy_id, devad);
+				   MDIO_C45_READ, phy_id, devad);
 	}
 
 	/* Step 5: waitting for MDIO_COMMAND_REG 's mdio_start==0,*/
drivers/net/ethernet/ibm/ibmveth.c +0 -2
index 61a9ab4fe047..70b3253e7ed5 100644
@@ -1238,7 +1238,6 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
 	struct iphdr *iph;
 	u16 mss = 0;
 
-restart_poll:
 	while (frames_processed < budget) {
 		if (!ibmveth_rxq_pending_buffer(adapter))
 			break;
@@ -1336,7 +1335,6 @@ restart_poll:
 		    napi_reschedule(napi)) {
 			lpar_rc = h_vio_signal(adapter->vdev->unit_address,
 					       VIO_IRQ_DISABLE);
-			goto restart_poll;
 		}
 	}
 
drivers/net/ethernet/marvell/mv643xx_eth.c +6 -1
index 4182290fdbcf..82f080a5ed5c 100644
@@ -2884,7 +2884,7 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
 
 	ret = mv643xx_eth_shared_of_probe(pdev);
 	if (ret)
-		return ret;
+		goto err_put_clk;
 	pd = dev_get_platdata(&pdev->dev);
 
 	msp->tx_csum_limit = (pd != NULL && pd->tx_csum_limit) ?
@@ -2892,6 +2892,11 @@ static int mv643xx_eth_shared_probe(struct platform_device *pdev)
 	infer_hw_params(msp);
 
 	return 0;
+
+err_put_clk:
+	if (!IS_ERR(msp->clk))
+		clk_disable_unprepare(msp->clk);
+	return ret;
 }
 
 static int mv643xx_eth_shared_remove(struct platform_device *pdev)
drivers/net/ethernet/marvell/sky2.c +23 -1
index 4b97aa24559a..5cc05df69a86 100644
@@ -46,6 +46,7 @@
 #include <linux/mii.h>
 #include <linux/of_device.h>
 #include <linux/of_net.h>
+#include <linux/dmi.h>
 
 #include <asm/irq.h>
 
@@ -93,7 +94,7 @@ static int copybreak __read_mostly = 128;
 module_param(copybreak, int, 0);
 MODULE_PARM_DESC(copybreak, "Receive copy threshold");
 
-static int disable_msi = 0;
+static int disable_msi = -1;
 module_param(disable_msi, int, 0);
 MODULE_PARM_DESC(disable_msi, "Disable Message Signaled Interrupt (MSI)");
 
@@ -4923,6 +4924,24 @@ static const char *sky2_name(u8 chipid, char *buf, int sz)
 	return buf;
 }
 
+static const struct dmi_system_id msi_blacklist[] = {
+	{
+		.ident = "Dell Inspiron 1545",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."),
+			DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 1545"),
+		},
+	},
+	{
+		.ident = "Gateway P-79",
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "Gateway"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "P-79"),
+		},
+	},
+	{}
+};
+
 static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 {
 	struct net_device *dev, *dev1;
@@ -5034,6 +5053,9 @@ static int sky2_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 		goto err_out_free_pci;
 	}
 
+	if (disable_msi == -1)
+		disable_msi = !!dmi_check_system(msi_blacklist);
+
 	if (!disable_msi && pci_enable_msi(pdev) == 0) {
 		err = sky2_test_msi(hw);
 		if (err) {
drivers/net/ethernet/mellanox/mlx4/cmd.c +1 -0
index fc222df47aa9..9e104dcfa9dd 100644
@@ -2636,6 +2636,7 @@ void mlx4_cmd_use_polling(struct mlx4_dev *dev)
 		down(&priv->cmd.event_sem);
 
 	kfree(priv->cmd.context);
+	priv->cmd.context = NULL;
 
 	up(&priv->cmd.poll_sem);
 }
drivers/net/ethernet/mellanox/mlx4/en_rx.c +21 -2
index 82bf1b539d87..ac7c64bae2a5 100644
@@ -725,13 +725,27 @@ static int get_fixed_ipv6_csum(__wsum hw_checksum, struct sk_buff *skb,
 	return 0;
 }
 #endif
+
+#define short_frame(size) ((size) <= ETH_ZLEN + ETH_FCS_LEN)
+
 static int check_csum(struct mlx4_cqe *cqe, struct sk_buff *skb, void *va,
 		      netdev_features_t dev_features)
 {
 	__wsum hw_checksum = 0;
+	void *hdr;
+
+	/* CQE csum doesn't cover padding octets in short ethernet
+	 * frames. And the pad field is appended prior to calculating
+	 * and appending the FCS field.
+	 *
+	 * Detecting these padded frames requires to verify and parse
+	 * IP headers, so we simply force all those small frames to skip
+	 * checksum complete.
+	 */
+	if (short_frame(skb->len))
+		return -EINVAL;
 
-	void *hdr = (u8 *)va + sizeof(struct ethhdr);
-
+	hdr = (u8 *)va + sizeof(struct ethhdr);
 	hw_checksum = csum_unfold((__force __sum16)cqe->checksum);
 
 	if (cqe->vlan_my_qpn & cpu_to_be32(MLX4_CQE_CVLAN_PRESENT_MASK) &&
@@ -851,6 +865,11 @@ int mlx4_en_process_rx_cq(struct net_device *dev, struct mlx4_en_cq *cq, int bud
 			(cqe->vlan_my_qpn & cpu_to_be32(MLX4_CQE_L2_TUNNEL));
 
 		if (likely(dev->features & NETIF_F_RXCSUM)) {
+			/* TODO: For IP non TCP/UDP packets when csum complete is
+			 * not an option (not supported or any other reason) we can
+			 * actually check cqe IPOK status bit and report
+			 * CHECKSUM_UNNECESSARY rather than CHECKSUM_NONE
+			 */
 			if (cqe->status & cpu_to_be16(MLX4_CQE_STATUS_TCP |
 						      MLX4_CQE_STATUS_UDP)) {
 				if ((cqe->status & cpu_to_be16(MLX4_CQE_STATUS_IPOK)) &&
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +3 -3
index 7911dc3da98e..37dfdb1329f4 100644
@@ -2652,13 +2652,13 @@ static int qp_get_mtt_size(struct mlx4_qp_context *qpc)
 	int total_pages;
 	int total_mem;
 	int page_offset = (be32_to_cpu(qpc->params2) >> 6) & 0x3f;
+	int tot;
 
 	sq_size = 1 << (log_sq_size + log_sq_sride + 4);
 	rq_size = (srq|rss|xrc) ? 0 : (1 << (log_rq_size + log_rq_stride + 4));
 	total_mem = sq_size + rq_size;
-	total_pages =
-		roundup_pow_of_two((total_mem + (page_offset << 6)) >>
-				   page_shift);
+	tot = (total_mem + (page_offset << 6)) >> page_shift;
+	total_pages = !tot ? 1 : roundup_pow_of_two(tot);
 
 	return total_pages;
 }
drivers/net/ethernet/renesas/ravb_main.c +1 -1
index f735dfcb64ae..29d31eb995d7 100644
@@ -453,7 +453,7 @@ static int ravb_dmac_init(struct net_device *ndev)
 	ravb_write(ndev, RCR_EFFS | RCR_ENCF | RCR_ETS0 | 0x18000000, RCR);
 
 	/* Set FIFO size */
-	ravb_write(ndev, TGC_TQP_AVBMODE1 | 0x00222200, TGC);
+	ravb_write(ndev, TGC_TQP_AVBMODE1 | 0x00112200, TGC);
 
 	/* Timestamp enable */
 	ravb_write(ndev, TCCR_TFEN, TCCR);
drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c +3 -1
index 0cd3ecff768b..398b08e07149 100644
@@ -535,8 +535,10 @@ static int rk_gmac_init(struct platform_device *pdev, void *priv)
 	int ret;
 
 	ret = phy_power_on(bsp_priv, true);
-	if (ret)
+	if (ret) {
+		gmac_clk_enable(bsp_priv, false);
 		return ret;
+	}
 
 	ret = gmac_clk_enable(bsp_priv, true);
 	if (ret)
drivers/net/ipvlan/ipvlan_main.c +8 -1
index a9268db4e349..ae02ce17c505 100644
@@ -389,7 +389,12 @@ static int ipvlan_nl_changelink(struct net_device *dev,
 	struct ipvl_dev *ipvlan = netdev_priv(dev);
 	struct ipvl_port *port = ipvlan_port_get_rtnl(ipvlan->phy_dev);
 
-	if (data && data[IFLA_IPVLAN_MODE]) {
+	if (!data)
+		return 0;
+	if (!ns_capable(dev_net(ipvlan->phy_dev)->user_ns, CAP_NET_ADMIN))
+		return -EPERM;
+
+	if (data[IFLA_IPVLAN_MODE]) {
 		u16 nmode = nla_get_u16(data[IFLA_IPVLAN_MODE]);
 
 		ipvlan_set_port_mode(port, nmode);
@@ -454,6 +459,8 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
 		struct ipvl_dev *tmp = netdev_priv(phy_dev);
 
 		phy_dev = tmp->phy_dev;
+		if (!ns_capable(dev_net(phy_dev)->user_ns, CAP_NET_ADMIN))
+			return -EPERM;
 	} else if (!netif_is_ipvlan_port(phy_dev)) {
 		err = ipvlan_port_create(phy_dev);
 		if (err < 0)
drivers/net/phy/mdio_bus.c +0 -1
index 88cb4592b6fb..ccefba7af960 100644
@@ -267,7 +267,6 @@ int __mdiobus_register(struct mii_bus *bus, struct module *owner)
 	err = device_register(&bus->dev);
 	if (err) {
 		pr_err("mii_bus %s failed to register\n", bus->id);
-		put_device(&bus->dev);
 		return -EINVAL;
 	}
 
drivers/net/phy/micrel.c +13 -1
index 920391165f18..ba84fc3637b1 100644
@@ -28,6 +28,7 @@
 #include <linux/micrel_phy.h>
 #include <linux/of.h>
 #include <linux/clk.h>
+#include <uapi/linux/mdio.h>
 
 /* Operation Mode Strap Override */
 #define MII_KSZPHY_OMSO				0x16
@@ -287,6 +288,17 @@ static int kszphy_config_init(struct phy_device *phydev)
 	return 0;
 }
 
+static int ksz8061_config_init(struct phy_device *phydev)
+{
+	int ret;
+
+	ret = phy_write_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_DEVID1, 0xB61A);
+	if (ret)
+		return ret;
+
+	return kszphy_config_init(phydev);
+}
+
 static int ksz9021_load_values_from_of(struct phy_device *phydev,
 				       const struct device_node *of_node,
 				       u16 reg,
@@ -771,7 +783,7 @@ static struct phy_driver ksphy_driver[] = {
 	.phy_id_mask	= 0x00fffff0,
 	.features	= (PHY_BASIC_FEATURES | SUPPORTED_Pause),
 	.flags		= PHY_HAS_MAGICANEG | PHY_HAS_INTERRUPT,
-	.config_init	= kszphy_config_init,
+	.config_init	= ksz8061_config_init,
 	.config_aneg	= genphy_config_aneg,
 	.read_status	= genphy_read_status,
 	.ack_interrupt	= kszphy_ack_interrupt,
drivers/net/ppp/pptp.c +1 -0
index 12a627fcc02c..53c1f2bd0f24 100644
@@ -577,6 +577,7 @@ static void pptp_sock_destruct(struct sock *sk)
 		pppox_unbind_sock(sk);
 	}
 	skb_queue_purge(&sk->sk_receive_queue);
+	dst_release(rcu_dereference_protected(sk->sk_dst_cache, 1));
 }
 
 static int pptp_create(struct net *net, struct socket *sock, int kern)
drivers/net/team/team.c +5 -22
index 33ffb573fd67..267a90423154 100644
@@ -247,17 +247,6 @@ static void __team_option_inst_mark_removed_port(struct team *team,
 	}
 }
 
-static bool __team_option_inst_tmp_find(const struct list_head *opts,
-					const struct team_option_inst *needle)
-{
-	struct team_option_inst *opt_inst;
-
-	list_for_each_entry(opt_inst, opts, tmp_list)
-		if (opt_inst == needle)
-			return true;
-	return false;
-}
-
 static int __team_options_register(struct team *team,
 				   const struct team_option *option,
 				   size_t option_count)
@@ -2447,7 +2436,6 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
 	int err = 0;
 	int i;
 	struct nlattr *nl_option;
-	LIST_HEAD(opt_inst_list);
 
 	team = team_nl_team_get(info);
 	if (!team)
@@ -2463,6 +2451,7 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
 		struct nlattr *opt_attrs[TEAM_ATTR_OPTION_MAX + 1];
 		struct nlattr *attr;
 		struct nlattr *attr_data;
+		LIST_HEAD(opt_inst_list);
 		enum team_option_type opt_type;
 		int opt_port_ifindex = 0; /* != 0 for per-port options */
 		u32 opt_array_index = 0;
@@ -2566,23 +2555,17 @@ static int team_nl_cmd_options_set(struct sk_buff *skb, struct genl_info *info)
 			if (err)
 				goto team_put;
 			opt_inst->changed = true;
-
-			/* dumb/evil user-space can send us duplicate opt,
-			 * keep only the last one
-			 */
-			if (__team_option_inst_tmp_find(&opt_inst_list,
-							opt_inst))
-				continue;
-
 			list_add(&opt_inst->tmp_list, &opt_inst_list);
 		}
 		if (!opt_found) {
 			err = -ENOENT;
 			goto team_put;
 		}
-	}
 
-	err = team_nl_send_event_options_get(team, &opt_inst_list);
+		err = team_nl_send_event_options_get(team, &opt_inst_list);
+		if (err)
+			break;
+	}
 
 team_put:
 	team_nl_team_put(team);
drivers/net/team/team_mode_loadbalance.c +15 -0
index a1536d0d83a9..a00335b3786e 100644
@@ -305,6 +305,20 @@ static int lb_bpf_func_set(struct team *team, struct team_gsetter_ctx *ctx)
 	return 0;
 }
 
+static void lb_bpf_func_free(struct team *team)
+{
+	struct lb_priv *lb_priv = get_lb_priv(team);
+	struct bpf_prog *fp;
+
+	if (!lb_priv->ex->orig_fprog)
+		return;
+
+	__fprog_destroy(lb_priv->ex->orig_fprog);
+	fp = rcu_dereference_protected(lb_priv->fp,
+				       lockdep_is_held(&team->lock));
+	bpf_prog_destroy(fp);
+}
+
 static int lb_tx_method_get(struct team *team, struct team_gsetter_ctx *ctx)
 {
 	struct lb_priv *lb_priv = get_lb_priv(team);
@@ -619,6 +633,7 @@ static void lb_exit(struct team *team)
 
 	team_options_unregister(team, lb_options,
 				ARRAY_SIZE(lb_options));
+	lb_bpf_func_free(team);
 	cancel_delayed_work_sync(&lb_priv->ex->stats.refresh_dw);
 	free_percpu(lb_priv->pcpu_stats);
 	kfree(lb_priv->ex);
drivers/net/vxlan.c +12 -1
index 553908adf3c5..5dadfc508ade 100644
@@ -1229,6 +1229,14 @@ static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb,
 		}
 	}
 
+	rcu_read_lock();
+
+	if (unlikely(!(vxlan->dev->flags & IFF_UP))) {
+		rcu_read_unlock();
+		atomic_long_inc(&vxlan->dev->rx_dropped);
+		goto drop;
+	}
+
 	stats = this_cpu_ptr(vxlan->dev->tstats);
 	u64_stats_update_begin(&stats->syncp);
 	stats->rx_packets++;
@@ -1237,6 +1245,8 @@ static void vxlan_rcv(struct vxlan_sock *vs, struct sk_buff *skb,
 
 	gro_cells_receive(&vxlan->gro_cells, skb);
 
+	rcu_read_unlock();
+
 	return;
 drop:
 	if (tun_dst)
@@ -2312,6 +2322,8 @@ static void vxlan_uninit(struct net_device *dev)
 {
 	struct vxlan_dev *vxlan = netdev_priv(dev);
 
+	gro_cells_destroy(&vxlan->gro_cells);
+
 	vxlan_fdb_delete_default(vxlan);
 
 	free_percpu(dev->tstats);
@@ -3056,7 +3068,6 @@ static void vxlan_dellink(struct net_device *dev, struct list_head *head)
 {
 	struct vxlan_dev *vxlan = netdev_priv(dev);
 
-	gro_cells_destroy(&vxlan->gro_cells);
 	list_del(&vxlan->next);
 	unregister_netdevice_queue(dev, head);
 }
drivers/net/wireless/mac80211_hwsim.c +1 -1
index 0d1abcfec003..0f582117b0e3 100644
@@ -3002,7 +3002,7 @@ static int hwsim_get_radio_nl(struct sk_buff *msg, struct genl_info *info)
 			goto out_err;
 		}
 
-		genlmsg_reply(skb, info);
+		res = genlmsg_reply(skb, info);
 		break;
 	}
 
drivers/net/xen-netback/netback.c +5 -5
index 02db20b26749..d324ac308e6d 100644
@@ -1538,11 +1538,6 @@ static int xenvif_handle_frag_list(struct xenvif_queue *queue, struct sk_buff *s
 		skb_frag_size_set(&frags[i], len);
 	}
 
-	/* Copied all the bits from the frag list -- free it. */
-	skb_frag_list_init(skb);
-	xenvif_skb_zerocopy_prepare(queue, nskb);
-	kfree_skb(nskb);
-
 	/* Release all the original (foreign) frags. */
 	for (f = 0; f < skb_shinfo(skb)->nr_frags; f++)
 		skb_frag_unref(skb, f);
@@ -1611,6 +1606,8 @@ static int xenvif_tx_submit(struct xenvif_queue *queue)
 		xenvif_fill_frags(queue, skb);
 
 		if (unlikely(skb_has_frag_list(skb))) {
+			struct sk_buff *nskb = skb_shinfo(skb)->frag_list;
+			xenvif_skb_zerocopy_prepare(queue, nskb);
 			if (xenvif_handle_frag_list(queue, skb)) {
 				if (net_ratelimit())
 					netdev_err(queue->vif->dev,
@@ -1619,6 +1616,9 @@ static int xenvif_tx_submit(struct xenvif_queue *queue)
 				kfree_skb(skb);
 				continue;
 			}
+			/* Copied all the bits from the frag list -- free it. */
+			skb_frag_list_init(skb);
+			kfree_skb(nskb);
 		}
 
 		skb->dev      = queue->vif->dev;
drivers/parport/parport_pc.c +1 -1
index bdce0679674c..02e6485c1ed5 100644
@@ -1377,7 +1377,7 @@ static struct superio_struct *find_superio(struct parport *p)
 {
 	int i;
 	for (i = 0; i < NR_SUPERIOS; i++)
-		if (superios[i].io != p->base)
+		if (superios[i].io == p->base)
 			return &superios[i];
 	return NULL;
 }
drivers/pinctrl/meson/pinctrl-meson8b.c +1 -1
index b505b87661f8..07c4153e6f3d 100644
@@ -656,7 +656,7 @@ static const char * const sd_a_groups[] = {
 
 static const char * const sdxc_a_groups[] = {
 	"sdxc_d0_0_a", "sdxc_d13_0_a", "sdxc_d47_a", "sdxc_clk_a",
-	"sdxc_cmd_a", "sdxc_d0_1_a", "sdxc_d0_13_1_a"
+	"sdxc_cmd_a", "sdxc_d0_1_a", "sdxc_d13_1_a"
 };
 
 static const char * const pcm_a_groups[] = {
drivers/platform/x86/Kconfig +1 -0
index 988ebe9a6b90..953974b5a9a9 100644
@@ -881,6 +881,7 @@ config INTEL_OAKTRAIL
 config SAMSUNG_Q10
 	tristate "Samsung Q10 Extras"
 	depends on ACPI
+	depends on BACKLIGHT_LCD_SUPPORT
 	select BACKLIGHT_CLASS_DEVICE
 	---help---
 	  This driver provides support for backlight control on Samsung Q10
drivers/regulator/s2mpa01.c +5 -5
index 92f88753bfed..2daf751c26c7 100644
@@ -303,13 +303,13 @@ static const struct regulator_desc regulators[] = {
 	regulator_desc_ldo(2, STEP_50_MV),
 	regulator_desc_ldo(3, STEP_50_MV),
 	regulator_desc_ldo(4, STEP_50_MV),
-	regulator_desc_ldo(5, STEP_50_MV),
+	regulator_desc_ldo(5, STEP_25_MV),
 	regulator_desc_ldo(6, STEP_25_MV),
 	regulator_desc_ldo(7, STEP_50_MV),
 	regulator_desc_ldo(8, STEP_50_MV),
 	regulator_desc_ldo(9, STEP_50_MV),
 	regulator_desc_ldo(10, STEP_50_MV),
-	regulator_desc_ldo(11, STEP_25_MV),
+	regulator_desc_ldo(11, STEP_50_MV),
 	regulator_desc_ldo(12, STEP_50_MV),
 	regulator_desc_ldo(13, STEP_50_MV),
 	regulator_desc_ldo(14, STEP_50_MV),
@@ -320,11 +320,11 @@ static const struct regulator_desc regulators[] = {
 	regulator_desc_ldo(19, STEP_50_MV),
 	regulator_desc_ldo(20, STEP_50_MV),
 	regulator_desc_ldo(21, STEP_50_MV),
-	regulator_desc_ldo(22, STEP_25_MV),
-	regulator_desc_ldo(23, STEP_25_MV),
+	regulator_desc_ldo(22, STEP_50_MV),
+	regulator_desc_ldo(23, STEP_50_MV),
 	regulator_desc_ldo(24, STEP_50_MV),
 	regulator_desc_ldo(25, STEP_50_MV),
-	regulator_desc_ldo(26, STEP_50_MV),
+	regulator_desc_ldo(26, STEP_25_MV),
 	regulator_desc_buck1_4(1),
 	regulator_desc_buck1_4(2),
 	regulator_desc_buck1_4(3),
drivers/regulator/s2mps11.c +3 -3
index b6d831b84e1d..47694dd515ab 100644
@@ -372,7 +372,7 @@ static const struct regulator_desc s2mps11_regulators[] = {
 	regulator_desc_s2mps11_ldo(32, STEP_50_MV),
 	regulator_desc_s2mps11_ldo(33, STEP_50_MV),
 	regulator_desc_s2mps11_ldo(34, STEP_50_MV),
-	regulator_desc_s2mps11_ldo(35, STEP_50_MV),
+	regulator_desc_s2mps11_ldo(35, STEP_25_MV),
 	regulator_desc_s2mps11_ldo(36, STEP_50_MV),
 	regulator_desc_s2mps11_ldo(37, STEP_50_MV),
 	regulator_desc_s2mps11_ldo(38, STEP_50_MV),
@@ -382,8 +382,8 @@ static const struct regulator_desc s2mps11_regulators[] = {
 	regulator_desc_s2mps11_buck1_4(4),
 	regulator_desc_s2mps11_buck5,
 	regulator_desc_s2mps11_buck67810(6, MIN_600_MV, STEP_6_25_MV),
-	regulator_desc_s2mps11_buck67810(7, MIN_600_MV, STEP_6_25_MV),
-	regulator_desc_s2mps11_buck67810(8, MIN_600_MV, STEP_6_25_MV),
+	regulator_desc_s2mps11_buck67810(7, MIN_600_MV, STEP_12_5_MV),
+	regulator_desc_s2mps11_buck67810(8, MIN_600_MV, STEP_12_5_MV),
 	regulator_desc_s2mps11_buck9,
 	regulator_desc_s2mps11_buck67810(10, MIN_750_MV, STEP_12_5_MV),
 };
drivers/s390/block/dasd_eckd.c +8 -0
index dac2f6883e28..80a43074c2f9 100644
@@ -4023,6 +4023,14 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp)
 		usrparm.psf_data &= 0x7fffffffULL;
 		usrparm.rssd_result &= 0x7fffffffULL;
 	}
+	/* at least 2 bytes are accessed and should be allocated */
+	if (usrparm.psf_data_len < 2) {
+		DBF_DEV_EVENT(DBF_WARNING, device,
+			      "Symmetrix ioctl invalid data length %d",
+			      usrparm.psf_data_len);
+		rc = -EINVAL;
+		goto out;
+	}
 	/* alloc I/O data area */
 	psf_data = kzalloc(usrparm.psf_data_len, GFP_KERNEL | GFP_DMA);
 	rssd_result = kzalloc(usrparm.rssd_result_len, GFP_KERNEL | GFP_DMA);
drivers/s390/net/qeth_core_main.c +6 -9
index 533bd2467910..b40604d0126f 100644
@@ -2452,11 +2452,12 @@ out:
 	return rc;
 }
 
-static void qeth_free_qdio_out_buf(struct qeth_qdio_out_q *q)
+static void qeth_free_output_queue(struct qeth_qdio_out_q *q)
 {
 	if (!q)
 		return;
 
+	qeth_clear_outq_buffers(q, 1);
 	qdio_free_buffers(q->qdio_bufs, QDIO_MAX_BUFFERS_PER_Q);
 	kfree(q);
 }
@@ -2529,10 +2530,8 @@ out_freeoutqbufs:
 		card->qdio.out_qs[i]->bufs[j] = NULL;
 	}
 out_freeoutq:
-	while (i > 0) {
-		qeth_free_qdio_out_buf(card->qdio.out_qs[--i]);
-		qeth_clear_outq_buffers(card->qdio.out_qs[i], 1);
-	}
+	while (i > 0)
+		qeth_free_output_queue(card->qdio.out_qs[--i]);
 	kfree(card->qdio.out_qs);
 	card->qdio.out_qs = NULL;
 out_freepool:
@@ -2565,10 +2564,8 @@ static void qeth_free_qdio_buffers(struct qeth_card *card)
 	qeth_free_buffer_pool(card);
 	/* free outbound qdio_qs */
 	if (card->qdio.out_qs) {
-		for (i = 0; i < card->qdio.no_out_queues; ++i) {
-			qeth_clear_outq_buffers(card->qdio.out_qs[i], 1);
-			qeth_free_qdio_out_buf(card->qdio.out_qs[i]);
-		}
+		for (i = 0; i < card->qdio.no_out_queues; i++)
+			qeth_free_output_queue(card->qdio.out_qs[i]);
 		kfree(card->qdio.out_qs);
 		card->qdio.out_qs = NULL;
 	}
drivers/s390/virtio/virtio_ccw.c +3 -1
index ff06bdfd2b20..2bb275fb39d1 100644
@@ -283,6 +283,8 @@ static void virtio_ccw_drop_indicators(struct virtio_ccw_device *vcdev)
 {
 	struct virtio_ccw_vq_info *info;
 
+	if (!vcdev->airq_info)
+		return;
 	list_for_each_entry(info, &vcdev->virtqueues, node)
 		drop_airq_indicator(info->vq, vcdev->airq_info);
 }
@@ -423,7 +425,7 @@ static int virtio_ccw_read_vq_conf(struct virtio_ccw_device *vcdev,
 	ret = ccw_io_helper(vcdev, ccw, VIRTIO_CCW_DOING_READ_VQ_CONF);
 	if (ret)
 		return ret;
-	return vcdev->config_block->num;
+	return vcdev->config_block->num ?: -ENOENT;
 }
 
 static void virtio_ccw_del_vq(struct virtqueue *vq, struct ccw1 *ccw)
drivers/scsi/csiostor/csio_attr.c +1 -1
index 2d1c4ebd40f9..6587f20cff1a 100644
@@ -582,12 +582,12 @@ csio_vport_create(struct fc_vport *fc_vport, bool disable)
 	}
 
 	fc_vport_set_state(fc_vport, FC_VPORT_INITIALIZING);
+	ln->fc_vport = fc_vport;
 
 	if (csio_fcoe_alloc_vnp(hw, ln))
 		goto error;
 
 	*(struct csio_lnode **)fc_vport->dd_data = ln;
-	ln->fc_vport = fc_vport;
 	if (!fc_vport->node_name)
 		fc_vport->node_name = wwn_to_u64(csio_ln_wwnn(ln));
 	if (!fc_vport->port_name)
drivers/scsi/isci/init.c +7 -7
index 77128d680e3b..6f38fa1f468a 100644
@@ -595,6 +595,13 @@ static struct isci_host *isci_host_alloc(struct pci_dev *pdev, int id)
 	shost->max_lun = ~0;
 	shost->max_cmd_len = MAX_COMMAND_SIZE;
 
+	/* turn on DIF support */
+	scsi_host_set_prot(shost,
+			   SHOST_DIF_TYPE1_PROTECTION |
+			   SHOST_DIF_TYPE2_PROTECTION |
+			   SHOST_DIF_TYPE3_PROTECTION);
+	scsi_host_set_guard(shost, SHOST_DIX_GUARD_CRC);
+
 	err = scsi_add_host(shost, &pdev->dev);
 	if (err)
 		goto err_shost;
@@ -682,13 +689,6 @@ static int isci_pci_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 			goto err_host_alloc;
 		}
 		pci_info->hosts[i] = h;
-
-		/* turn on DIF support */
-		scsi_host_set_prot(to_shost(h),
-				   SHOST_DIF_TYPE1_PROTECTION |
-				   SHOST_DIF_TYPE2_PROTECTION |
-				   SHOST_DIF_TYPE3_PROTECTION);
-		scsi_host_set_guard(to_shost(h), SHOST_DIX_GUARD_CRC);
 	}
 
 	err = isci_setup_interrupts(pdev);
drivers/scsi/libfc/fc_lport.c +3 -3
index e01a29863c38..867fc036d6ef 100644
@@ -1739,14 +1739,14 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
 	    fc_frame_payload_op(fp) != ELS_LS_ACC) {
 		FC_LPORT_DBG(lport, "FLOGI not accepted or bad response\n");
 		fc_lport_error(lport, fp);
-		goto err;
+		goto out;
 	}
 
 	flp = fc_frame_payload_get(fp, sizeof(*flp));
 	if (!flp) {
 		FC_LPORT_DBG(lport, "FLOGI bad response\n");
 		fc_lport_error(lport, fp);
-		goto err;
+		goto out;
 	}
 
 	mfs = ntohs(flp->fl_csp.sp_bb_data) &
@@ -1756,7 +1756,7 @@ void fc_lport_flogi_resp(struct fc_seq *sp, struct fc_frame *fp,
 		FC_LPORT_DBG(lport, "FLOGI bad mfs:%hu response, "
 			     "lport->mfs:%hu\n", mfs, lport->mfs);
 		fc_lport_error(lport, fp);
-		goto err;
+		goto out;
 	}
 
 	if (mfs <= lport->mfs) {
drivers/scsi/libiscsi.c +6 -0
index 009a2ef829d6..0fdc8c417035 100644
@@ -1448,7 +1448,13 @@ static int iscsi_xmit_task(struct iscsi_conn *conn)
 	if (test_bit(ISCSI_SUSPEND_BIT, &conn->suspend_tx))
 		return -ENODATA;
 
+	spin_lock_bh(&conn->session->back_lock);
+	if (conn->task == NULL) {
+		spin_unlock_bh(&conn->session->back_lock);
+		return -ENODATA;
+	}
 	__iscsi_get_task(task);
+	spin_unlock_bh(&conn->session->back_lock);
 	spin_unlock_bh(&conn->session->frwd_lock);
 	rc = conn->session->tt->xmit_task(task);
 	spin_lock_bh(&conn->session->frwd_lock);
drivers/scsi/libsas/sas_expander.c +2 -0
index 12886f96b286..7be581f7c35d 100644
@@ -818,6 +818,7 @@ static struct domain_device *sas_ex_discover_end_dev(
 		rphy = sas_end_device_alloc(phy->port);
 		if (!rphy)
 			goto out_free;
+		rphy->identify.phy_identifier = phy_id;
 
 		child->rphy = rphy;
 		get_device(&rphy->dev);
@@ -845,6 +846,7 @@ static struct domain_device *sas_ex_discover_end_dev(
 
 		child->rphy = rphy;
 		get_device(&rphy->dev);
+		rphy->identify.phy_identifier = phy_id;
 		sas_fill_in_rphy(child, rphy);
 
 		list_add_tail(&child->disco_list_node, &parent->port->disco_list);
drivers/scsi/qla4xxx/ql4_os.c +2 -0
index d8c03431d0aa..f9f899ec9427 100644
@@ -7245,6 +7245,8 @@ static int qla4xxx_sysfs_ddb_tgt_create(struct scsi_qla_host *ha,
 
 	rc = qla4xxx_copy_from_fwddb_param(fnode_sess, fnode_conn,
 					   fw_ddb_entry);
+	if (rc)
+		goto free_sess;
 
 	ql4_printk(KERN_INFO, ha, "%s: sysfs entry %s created\n",
 		   __func__, fnode_sess->dev.kobj.name);
drivers/scsi/virtio_scsi.c +0 -2
index 8ef905cbfc9c..9237427728ce 100644
@@ -692,7 +692,6 @@ static int virtscsi_device_reset(struct scsi_cmnd *sc)
 		return FAILED;
 
 	memset(cmd, 0, sizeof(*cmd));
-	cmd->sc = sc;
 	cmd->req.tmf = (struct virtio_scsi_ctrl_tmf_req){
 		.type = VIRTIO_SCSI_T_TMF,
 		.subtype = cpu_to_virtio32(vscsi->vdev,
@@ -751,7 +750,6 @@ static int virtscsi_abort(struct scsi_cmnd *sc)
 		return FAILED;
 
 	memset(cmd, 0, sizeof(*cmd));
-	cmd->sc = sc;
 	cmd->req.tmf = (struct virtio_scsi_ctrl_tmf_req){
 		.type = VIRTIO_SCSI_T_TMF,
 		.subtype = VIRTIO_SCSI_T_TMF_ABORT_TASK,
drivers/staging/lustre/lnet/klnds/socklnd/socklnd.c +5 -4
index ecfe73302350..46a24b4ead09 100644
@@ -2621,8 +2621,8 @@ ksocknal_enumerate_interfaces(ksock_net_t *net)
 
 		net->ksnn_interfaces[j].ksni_ipaddr = ip;
 		net->ksnn_interfaces[j].ksni_netmask = mask;
-		strncpy(&net->ksnn_interfaces[j].ksni_name[0],
-			names[i], IFNAMSIZ);
+		strlcpy(net->ksnn_interfaces[j].ksni_name,
+			names[i], sizeof(net->ksnn_interfaces[j].ksni_name));
 		j++;
 	}
 
@@ -2805,8 +2805,9 @@ ksocknal_startup(lnet_ni_t *ni)
 				goto fail_1;
 			}
 
-			strncpy(&net->ksnn_interfaces[i].ksni_name[0],
-				ni->ni_interfaces[i], IFNAMSIZ);
+			strlcpy(net->ksnn_interfaces[i].ksni_name,
+				ni->ni_interfaces[i],
+				sizeof(net->ksnn_interfaces[i].ksni_name));
 		}
 		net->ksnn_ninterfaces = i;
 	}
drivers/staging/lustre/lnet/lnet/config.c +8 -6
index 1b3bc8386524..75f120da0a84 100644
@@ -650,8 +650,8 @@ lnet_parse_route(char *str, int *im_a_router)
 	INIT_LIST_HEAD(&nets);
 
 	/* save a copy of the string for error messages */
-	strncpy(cmd, str, sizeof(cmd) - 1);
-	cmd[sizeof(cmd) - 1] = 0;
+	strncpy(cmd, str, sizeof(cmd));
+	cmd[sizeof(cmd) - 1] = '\0';
 
 	sep = str;
 	for (;;) {
@@ -972,11 +972,13 @@ lnet_splitnets(char *source, struct list_head *nets)
 			return 0;
 
 		offset += (int)(sep - tb->ltb_text);
-		tb2 = lnet_new_text_buf(strlen(sep));
+		len = strlen(sep);
+		tb2 = lnet_new_text_buf(len);
 		if (tb2 == NULL)
 			return -ENOMEM;
 
-		strcpy(tb2->ltb_text, sep);
+		strncpy(tb2->ltb_text, sep, len);
+		tb2->ltb_text[len] = '\0';
 		list_add_tail(&tb2->ltb_list, nets);
 
 		tb = tb2;
@@ -1021,8 +1023,8 @@ lnet_match_networks(char **networksp, char *ip2nets, __u32 *ipaddrs, int nip)
 		tb = list_entry(raw_entries.next, struct lnet_text_buf_t,
 				    ltb_list);
 
-		strncpy(source, tb->ltb_text, sizeof(source)-1);
-		source[sizeof(source)-1] = 0;
+		strncpy(source, tb->ltb_text, sizeof(source));
+		source[sizeof(source)-1] = '\0';
 
 		/* replace ltb_text with the network(s) add on match */
 		rc = lnet_match_network_tokens(tb->ltb_text, ipaddrs, nip);
drivers/staging/lustre/lnet/selftest/conrpc.c +2 -2
index 64a0335934f3..1066c70434b1 100644
@@ -612,8 +612,8 @@ lstcon_sesrpc_prep(lstcon_node_t *nd, int transop,
 		msrq = &(*crpc)->crp_rpc->crpc_reqstmsg.msg_body.mksn_reqst;
 		msrq->mksn_sid     = console_session.ses_id;
 		msrq->mksn_force   = console_session.ses_force;
-		strncpy(msrq->mksn_name, console_session.ses_name,
-			strlen(console_session.ses_name));
+		strlcpy(msrq->mksn_name, console_session.ses_name,
+			sizeof(msrq->mksn_name));
 		break;
 
 	case LST_TRANS_SESEND:
drivers/staging/lustre/lnet/selftest/console.c +4 -2
index d315dd44ae3b..ed1bc6ac79dd 100644
@@ -1739,7 +1739,8 @@ lstcon_session_new(char *name, int key, unsigned feats,
 	console_session.ses_feats_updated = 0;
 	console_session.ses_timeout = (timeout <= 0) ?
 				      LST_CONSOLE_TIMEOUT : timeout;
-	strcpy(console_session.ses_name, name);
+	strlcpy(console_session.ses_name, name,
+		sizeof(console_session.ses_name));
 
 	rc = lstcon_batch_add(LST_DEFAULT_BATCH);
 	if (rc != 0)
@@ -1959,7 +1960,8 @@ lstcon_acceptor_handle(srpc_server_rpc_t *rpc)
 	if (grp->grp_userland == 0)
 		grp->grp_userland = 1;
 
-	strcpy(jrep->join_session, console_session.ses_name);
+	strlcpy(jrep->join_session, console_session.ses_name,
+		sizeof(jrep->join_session));
 	jrep->join_timeout = console_session.ses_timeout;
 	jrep->join_status  = 0;
 
drivers/staging/lustre/lustre/include/lustre_disk.h +1 -0
index 5e1ac129a681..7c6933ffc9c1 100644
@@ -68,6 +68,7 @@
    everything as string options */
 
 #define LMD_MAGIC    0xbdacbd03
+#define LMD_PARAMS_MAXLEN	4096
 
 /* gleaned from the mount command - no persistent info here */
 struct lustre_mount_data {
drivers/staging/lustre/lustre/libcfs/debug.c +3 -3
index 1d1c67164418..170775bc7bc0 100644
@@ -512,9 +512,9 @@ int libcfs_debug_init(unsigned long bufsize)
 	}
 
 	if (libcfs_debug_file_path != NULL) {
-		strncpy(libcfs_debug_file_path_arr,
-			libcfs_debug_file_path, PATH_MAX-1);
-		libcfs_debug_file_path_arr[PATH_MAX - 1] = '\0';
+		strlcpy(libcfs_debug_file_path_arr,
+			libcfs_debug_file_path,
+			sizeof(libcfs_debug_file_path_arr));
 	}
 
 	/* If libcfs_debug_mb is set to an invalid value or uninitialized
drivers/staging/lustre/lustre/libcfs/hash.c +1 -2
index 030874428952..55fc2190a5bb 100644
@@ -1062,8 +1062,7 @@ cfs_hash_create(char *name, unsigned cur_bits, unsigned max_bits,
 	if (hs == NULL)
 		return NULL;
 
-	strncpy(hs->hs_name, name, len);
-	hs->hs_name[len - 1] = '\0';
+	strlcpy(hs->hs_name, name, len);
 	hs->hs_flags = flags;
 
 	atomic_set(&hs->hs_refcount, 1);
drivers/staging/lustre/lustre/libcfs/workitem.c +2 -2
index e1143a566ac4..f6cc434af756 100644
@@ -360,8 +360,8 @@ cfs_wi_sched_create(char *name, struct cfs_cpt_table *cptab,
 	if (sched == NULL)
 		return -ENOMEM;
 
-	strncpy(sched->ws_name, name, CFS_WS_NAME_LEN);
-	sched->ws_name[CFS_WS_NAME_LEN - 1] = '\0';
+	strlcpy(sched->ws_name, name, CFS_WS_NAME_LEN);
+
 	sched->ws_cptab = cptab;
 	sched->ws_cpt = cpt;
 
drivers/staging/lustre/lustre/llite/dir.c +1 -1
index 5c9502b5b358..951259a98323 100644
@@ -641,7 +641,7 @@ static int ll_send_mgc_param(struct obd_export *mgc, char *string)
 	if (!msp)
 		return -ENOMEM;
 
-	strncpy(msp->mgs_param, string, MGS_PARAM_MAXLEN);
+	strlcpy(msp->mgs_param, string, sizeof(msp->mgs_param));
 	rc = obd_set_info_async(NULL, mgc, sizeof(KEY_SET_INFO), KEY_SET_INFO,
 				sizeof(struct mgs_send_param), msp, NULL);
 	if (rc)
drivers/staging/lustre/lustre/lov/lov_pool.c +1 -2
index b03827ef6514..b43ce6cd64c2 100644
@@ -412,8 +412,7 @@ int lov_pool_new(struct obd_device *obd, char *poolname)
 	if (!new_pool)
 		return -ENOMEM;
 
-	strncpy(new_pool->pool_name, poolname, LOV_MAXPOOLNAME);
-	new_pool->pool_name[LOV_MAXPOOLNAME] = '\0';
+	strlcpy(new_pool->pool_name, poolname, sizeof(new_pool->pool_name));
 	new_pool->pool_lobd = obd;
 	/* ref count init to 1 because when created a pool is always used
 	 * up to deletion
drivers/staging/lustre/lustre/obdclass/obd_mount.c +7 -3
index 48003d5325e3..7617c57d16e0 100644
@@ -892,7 +892,7 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
 	}
 	lmd->lmd_magic = LMD_MAGIC;
 
-	lmd->lmd_params = kzalloc(4096, GFP_NOFS);
+	lmd->lmd_params = kzalloc(LMD_PARAMS_MAXLEN, GFP_NOFS);
 	if (!lmd->lmd_params)
 		return -ENOMEM;
 	lmd->lmd_params[0] = '\0';
@@ -978,7 +978,7 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
 				goto invalid;
 			clear++;
 		} else if (strncmp(s1, "param=", 6) == 0) {
-			int length;
+			size_t length, params_length;
 			char *tail = strchr(s1 + 6, ',');
 
 			if (tail == NULL)
@@ -986,8 +986,12 @@ static int lmd_parse(char *options, struct lustre_mount_data *lmd)
 			else
 				length = tail - s1;
 			length -= 6;
+			params_length = strlen(lmd->lmd_params);
+			if (params_length + length + 1 >= LMD_PARAMS_MAXLEN)
+				return -E2BIG;
 			strncat(lmd->lmd_params, s1 + 6, length);
-			strcat(lmd->lmd_params, " ");
+			lmd->lmd_params[params_length + length] = '\0';
+			strlcat(lmd->lmd_params, " ", LMD_PARAMS_MAXLEN);
 			clear++;
 		} else if (strncmp(s1, "osd=", 4) == 0) {
 			rc = lmd_parse_string(&lmd->lmd_osd_type, s1 + 4);
drivers/staging/lustre/lustre/ptlrpc/ptlrpcd.c +1 -0
index ce036a1ac466..ac87aa12bd7e 100644
@@ -422,6 +422,7 @@ static int ptlrpcd(void *arg)
 	complete(&pc->pc_starting);
 
 	/*
+
 	 * This mainloop strongly resembles ptlrpc_set_wait() except that our
 	 * set never completes.  ptlrpcd_check() calls ptlrpc_check_set() when
 	 * there are requests in the set. New requests come in on the set's
drivers/staging/lustre/lustre/ptlrpc/sec_config.c +1 -2
index 7ff948fe1424..7a206705865b 100644
@@ -83,8 +83,7 @@ int sptlrpc_parse_flavor(const char *str, struct sptlrpc_flavor *flvr)
 		return 0;
 	}
 
-	strncpy(buf, str, sizeof(buf));
-	buf[sizeof(buf) - 1] = '\0';
+	strlcpy(buf, str, sizeof(buf));
 
 	bulk = strchr(buf, '-');
 	if (bulk)
drivers/staging/rdma/hfi1/ud.c +0 -1
index 5a9c784bec04..a88e37444be0 100644
@@ -793,7 +793,6 @@ void hfi1_ud_rcv(struct hfi1_packet *packet)
 	    opcode == IB_OPCODE_UD_SEND_ONLY_WITH_IMMEDIATE) {
 		wc.ex.imm_data = ohdr->u.ud.imm_data;
 		wc.wc_flags = IB_WC_WITH_IMM;
-		tlen -= sizeof(u32);
 	} else if (opcode == IB_OPCODE_UD_SEND_ONLY) {
 		wc.ex.imm_data = 0;
 		wc.wc_flags = 0;
drivers/target/iscsi/iscsi_target.c +2 -2
index 58fe27705b96..cbb4414edd71 100644
@@ -4232,9 +4232,9 @@ static void iscsit_release_commands_from_conn(struct iscsi_conn *conn)
 		struct se_cmd *se_cmd = &cmd->se_cmd;
 
 		if (se_cmd->se_tfo != NULL) {
-			spin_lock(&se_cmd->t_state_lock);
+			spin_lock_irq(&se_cmd->t_state_lock);
 			se_cmd->transport_state |= CMD_T_FABRIC_STOP;
-			spin_unlock(&se_cmd->t_state_lock);
+			spin_unlock_irq(&se_cmd->t_state_lock);
 		}
 	}
 	spin_unlock_bh(&conn->cmd_lock);
drivers/thermal/int340x_thermal/processor_thermal_device.c +1 -1
index ccc0ad02d066..7f374ab5b176 100644
@@ -363,7 +363,7 @@ static int  proc_thermal_pci_probe(struct pci_dev *pdev,
 		proc_priv->soc_dts = intel_soc_dts_iosf_init(
 					INTEL_SOC_DTS_INTERRUPT_MSI, 2, 0);
 
-		if (proc_priv->soc_dts && pdev->irq) {
+		if (!IS_ERR(proc_priv->soc_dts) && pdev->irq) {
 			ret = pci_enable_msi(pdev);
 			if (!ret) {
 				ret = request_threaded_irq(pdev->irq, NULL,
drivers/tty/serial/8250/8250_pci.c +123 -18

160 lines not on this page · raw message

drivers/tty/serial/fsl_lpuart.c +1 -1
index 8b5ec9386f0f..1544a7cc76ff 100644

Lines of this file are not shown. View the raw message.

drivers/usb/dwc3/gadget.c +1 -0
index b6037a0ae829..557f08adf644 100644

Lines of this file are not shown. View the raw message.

drivers/usb/gadget/function/f_sourcesink.c +1 -1
index 67b243989938..d7d095781be1 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/cp210x.c +1 -0
index 97382301c393..b317594a6342 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/ftdi_sio.c +2 -0
index 3e5b189a79b4..4287e2b1c175 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/ftdi_sio_ids.h +6 -0
index 76a10b222ff9..ddf5ab983dc9 100644

Lines of this file are not shown. View the raw message.

drivers/usb/serial/option.c +2 -0
index 7bc2c9fef605..b2b7c12e5c86 100644

Lines of this file are not shown. View the raw message.

fs/9p/cache.c +4 -4
index a69260f27555..103ca5e1267b 100644

Lines of this file are not shown. View the raw message.

fs/9p/v9fs.h +1 -1
index 0923f2cf3c80..6877050384a1 100644

Lines of this file are not shown. View the raw message.

fs/9p/v9fs_vfs.h +21 -2
index 5a0db6dec8d1..aaee1e6584e6 100644

Lines of this file are not shown. View the raw message.

fs/9p/vfs_file.c +5 -1
index e7b3d2c4472d..62ce8b4a7e5f 100644

Lines of this file are not shown. View the raw message.

fs/9p/vfs_inode.c +12 -13
index 73f1d1b3a51c..2de1505aedfd 100644

Lines of this file are not shown. View the raw message.

fs/9p/vfs_inode_dotl.c +14 -13
index 0b88744c6446..7ae67fcca031 100644

Lines of this file are not shown. View the raw message.

fs/9p/vfs_super.c +2 -2
index bf495cedec26..ccf935d9e722 100644

Lines of this file are not shown. View the raw message.

fs/autofs4/expire.c +2 -1
index 7a5a598a2d94..0d8b9c4f27f2 100644

Lines of this file are not shown. View the raw message.

fs/autofs4/inode.c +3 -1
index 1132fe71b312..0fd472d67029 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/extent_io.c +2 -2
index 42e7f6a8f91d..a18f558b4477 100644

Lines of this file are not shown. View the raw message.

fs/btrfs/volumes.c +2 -2
index 5e8fe8f3942d..d1cca19b29d3 100644

Lines of this file are not shown. View the raw message.

fs/ceph/snap.c +2 -1
index 4aa7122a8d38..a485d0cdc559 100644

Lines of this file are not shown. View the raw message.

fs/cifs/file.c +7 -5
index 1062e96ee272..0305e3866216 100644

Lines of this file are not shown. View the raw message.

fs/cifs/smb2pdu.h +2 -2
index aacb15bd56fe..f087158c5555 100644

Lines of this file are not shown. View the raw message.

fs/drop_caches.c +7 -1
index d72d52b90433..280460fef066 100644

Lines of this file are not shown. View the raw message.

fs/ext2/super.c +25 -14
index 748d35afc902..860024392969 100644

Lines of this file are not shown. View the raw message.

fs/ext4/resize.c +2 -1
index 2fc1564f62dd..4bd12247a9be 100644

Lines of this file are not shown. View the raw message.

fs/hugetlbfs/inode.c +12 -0
index ab34f613fa85..cefae2350da5 100644

Lines of this file are not shown. View the raw message.

fs/jbd2/transaction.c +20 -13
index bce343febb9e..c34433432d47 100644

Lines of this file are not shown. View the raw message.

fs/ncpfs/ioctl.c +2 -2
index 0a3f9b594602..37779ed3f790 100644

Lines of this file are not shown. View the raw message.

fs/nfs/direct.c +14 -1
index 211440722e24..88cb8e0d6014 100644

Lines of this file are not shown. View the raw message.

fs/nfs/filelayout/filelayout.c +15 -2
index fd8da630fd22..8e268965c96d 100644

Lines of this file are not shown. View the raw message.

fs/nfs/flexfilelayout/flexfilelayout.c +22 -3
index c8e90152b61b..6506775575aa 100644

Lines of this file are not shown. View the raw message.

fs/nfs/pagelist.c +9 -3
index 4bdc2fc86280..8a2077408ab0 100644

Lines of this file are not shown. View the raw message.

fs/nfs/pnfs.c +18 -6
index c8e75e5e6a67..d34fb0feb5c2 100644

Lines of this file are not shown. View the raw message.

fs/nfs/read.c +1 -1
index 0a5e33f33b5c..0bb580174cb3 100644

Lines of this file are not shown. View the raw message.

fs/nfs/super.c +5 -0
index 412fcfbc50e2..9b42139a479b 100644

Lines of this file are not shown. View the raw message.

fs/nfsd/nfs3proc.c +14 -2
index 7b755b7f785c..91146f025769 100644

Lines of this file are not shown. View the raw message.

fs/nfsd/nfs3xdr.c +1 -0
index 7162ab7bc093..d4fa7fbc37dc 100644

Lines of this file are not shown. View the raw message.

fs/nfsd/nfsctl.c +1 -1
index 03c7a4e7b6ba..0cd57db5c5af 100644

Lines of this file are not shown. View the raw message.

include/keys/user-type.h +1 -1
index c56fef40f53e..5d744ec8f644 100644

Lines of this file are not shown. View the raw message.

include/linux/cpufreq.h +2 -10
index 177c7680c1a8..e684a9ba98a3 100644

Lines of this file are not shown. View the raw message.

include/linux/device-mapper.h +1 -1
index 899ab9f8549e..82621fa441f3 100644

Lines of this file are not shown. View the raw message.

include/net/gro_cells.h +10 -2
index 86316f90ea1e..cd856b7a11f5 100644

Lines of this file are not shown. View the raw message.

include/net/icmp.h +8 -1
index 970028e13382..06ceb483475d 100644

Lines of this file are not shown. View the raw message.

include/net/ip.h +2 -0
index 7b968927477d..e2320f9e4d3e 100644

Lines of this file are not shown. View the raw message.

include/net/phonet/pep.h +3 -2
index b669fe6dbc3b..98f31c7ea23d 100644

Lines of this file are not shown. View the raw message.

kernel/futex.c +5 -2
index a26d217c99fe..0c92c8d34ffa 100644

Lines of this file are not shown. View the raw message.

kernel/locking/rtmutex.c +45 -7

52 lines not on this page · raw message

kernel/locking/rtmutex_common.h +5 -3
index e317e1cbb3eb..6f8f68edb700 100644

Lines of this file are not shown. View the raw message.

kernel/rcu/tree.c +14 -6
index 4e886ccd40db..082aedefe29c 100644

Lines of this file are not shown. View the raw message.

kernel/sysctl.c +10 -1
index 7e832f9a8f42..beadcf83ceba 100644

Lines of this file are not shown. View the raw message.

kernel/trace/trace.c +0 -1
index 1a47a64d623f..8c097de8a596 100644

Lines of this file are not shown. View the raw message.

lib/assoc_array.c +5 -3
index 5cd093589c5a..3b46c5433b7a 100644

Lines of this file are not shown. View the raw message.

mm/hugetlb.c +12 -2
index f1a45f5077fe..324b2953e57e 100644

Lines of this file are not shown. View the raw message.

mm/memory_hotplug.c +5 -1
index 0addef5f8aa3..804cbfe9132d 100644

Lines of this file are not shown. View the raw message.

mm/mempolicy.c +3 -3
index 44134ba6fb53..5418ab0c5e2c 100644

Lines of this file are not shown. View the raw message.

mm/migrate.c +11 -0
index ce88dff1da98..73da75d5e5b2 100644

Lines of this file are not shown. View the raw message.

mm/mmap.c +3 -4
index 3074dbcd9621..baa4c1280bff 100644

Lines of this file are not shown. View the raw message.

mm/shmem.c +8 -4
index d902b413941a..f11aec40f2e1 100644

Lines of this file are not shown. View the raw message.

mm/vmalloc.c +1 -1
index de8e372ece04..400e580725da 100644

Lines of this file are not shown. View the raw message.

net/9p/client.c +1 -1
index 8fba9cd973c1..443db202db09 100644

Lines of this file are not shown. View the raw message.

net/batman-adv/soft-interface.c +2 -0
index 5aeb585571ed..4812123e0a2c 100644

Lines of this file are not shown. View the raw message.

net/bridge/br_multicast.c +1 -8
index 270d9c9a5331..d80c15d028fe 100644

Lines of this file are not shown. View the raw message.

net/bridge/netfilter/ebtables.c +4 -0
index 8b8a43fda6ca..f13402d407e4 100644

Lines of this file are not shown. View the raw message.

net/ceph/messenger.c +8 -4
index 3e6897efe1eb..3ed2796d008b 100644

Lines of this file are not shown. View the raw message.

net/core/net-sysfs.c +3 -0
index f88a62ab019d..579d351f6ddd 100644

Lines of this file are not shown. View the raw message.

net/hsr/hsr_device.c +9 -9
index c7d1adca30d8..943378d6e4c3 100644

Lines of this file are not shown. View the raw message.

net/hsr/hsr_framereg.c +12 -0
index bace124d14ef..46415839e67e 100644

Lines of this file are not shown. View the raw message.

net/hsr/hsr_framereg.h +1 -0
index 438b40f98f5a..7a8f4e98f515 100644

Lines of this file are not shown. View the raw message.

net/ipv4/cipso_ipv4.c +19 -4
index cfaacaa023e6..7fe643062013 100644

Lines of this file are not shown. View the raw message.

net/ipv4/icmp.c +4 -3
index 36e26977c908..d0ec8a997210 100644

Lines of this file are not shown. View the raw message.

net/ipv4/inet_connection_sock.c +1 -1
index 01acb94c4963..6c9158805b57 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ip_options.c +17 -5
index bd246792360b..d3922a93e4c1 100644

Lines of this file are not shown. View the raw message.

net/ipv4/ip_vti.c +50 -0

50 lines not on this page · raw message

net/ipv4/netfilter/arp_tables.c +2 -0
index f51b32ed353c..cbe630aab44a 100644

Lines of this file are not shown. View the raw message.

net/ipv4/netfilter/ip_tables.c +2 -0
index 8adb6e9ba8f5..53d664a7774c 100644

Lines of this file are not shown. View the raw message.

net/ipv4/route.c +4 -0
index 80ce6b0672d2..97bf6c785767 100644

Lines of this file are not shown. View the raw message.

net/ipv4/syncookies.c +6 -1
index c22a74374a9c..f3d3ac5c23d5 100644

Lines of this file are not shown. View the raw message.

net/ipv4/tcp_input.c +7 -1
index 1aff93d76f24..561f568e8938 100644

Lines of this file are not shown. View the raw message.

net/ipv4/udp.c +1 -1
index 6f929689fd03..0924f93a0aff 100644

Lines of this file are not shown. View the raw message.

net/ipv4/udp_impl.h +1 -1
index 7e0fe4bdd967..feb50a16398d 100644

Lines of this file are not shown. View the raw message.

net/ipv4/udplite.c +1 -1
index 3b3efbda48e1..78766b32b78b 100644

Lines of this file are not shown. View the raw message.

net/ipv6/ip6mr.c +4 -4
index 74b3e9718e84..e348a140e540 100644

Lines of this file are not shown. View the raw message.

net/ipv6/netfilter/ip6_tables.c +2 -0
index 96de322fe5e2..f563cf3fcc4c 100644

Lines of this file are not shown. View the raw message.

net/ipv6/route.c +1 -1
index 1cb8954885ec..fffd2ad28942 100644

Lines of this file are not shown. View the raw message.

net/ipv6/sit.c +4 -3
index 11282ffca567..96582ec9c807 100644

Lines of this file are not shown. View the raw message.

net/ipv6/udp.c +1 -1
index 6eb1e9293b6f..f4e06748f86b 100644

Lines of this file are not shown. View the raw message.

net/ipv6/udp_impl.h +1 -1
index 0682c031ccdc..3c1dbc9f74cf 100644

Lines of this file are not shown. View the raw message.

net/ipv6/udplite.c +1 -1
index 9cf097e206e9..d1eaeeaa34d2 100644

Lines of this file are not shown. View the raw message.

net/l2tp/l2tp_ip6.c +1 -3
index e066111b9398..a88649c5d26c 100644

Lines of this file are not shown. View the raw message.

net/mac80211/cfg.c +4 -0
index 67348d8ac35d..7349bf26ae7b 100644

Lines of this file are not shown. View the raw message.

net/mac80211/rx.c +3 -1
index acacceec8cd8..833ad779659c 100644

Lines of this file are not shown. View the raw message.

net/netfilter/ipvs/ip_vs_ctl.c +12 -0
index 3167ec76903a..56c62b65923f 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nf_conntrack_proto_tcp.c +4 -0
index 278f3b9356ef..7cc1d9c22a9f 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nfnetlink_acct.c +3 -0
index fefbf5f0b28d..088e8da06b00 100644

Lines of this file are not shown. View the raw message.

net/netfilter/nfnetlink_log.c +1 -1
index 740cce4685ac..85b4f7902b49 100644

Lines of this file are not shown. View the raw message.

net/nfc/llcp_commands.c +20 -0
index 04f060488686..96277ac37dac 100644

Lines of this file are not shown. View the raw message.

net/nfc/llcp_core.c +20 -4
index 98876274a1ee..c1334b826dd5 100644

Lines of this file are not shown. View the raw message.

net/packet/af_packet.c +1 -1
index 753b2837318d..d517dd7f4ac7 100644

Lines of this file are not shown. View the raw message.

net/phonet/pep.c +16 -16
index 850a86cde0b3..f6aa532bcbf6 100644

Lines of this file are not shown. View the raw message.

net/socket.c +6 -18
index 96133777d17c..e5bb73eb36fe 100644

Lines of this file are not shown. View the raw message.

net/unix/af_unix.c +29 -19

48 lines not on this page · raw message

net/unix/diag.c +2 -1
index 384c84e83462..3183d9b8ab33 100644

Lines of this file are not shown. View the raw message.

net/wireless/reg.c +2 -2
index 50dffd183cc6..429abf421906 100644

Lines of this file are not shown. View the raw message.

net/x25/af_x25.c +14 -6
index 8d7b2802d33f..5dca42dbc737 100644

Lines of this file are not shown. View the raw message.

security/keys/key.c +2 -2
index 4d971bf88ac3..03160f1f1aa2 100644

Lines of this file are not shown. View the raw message.

security/keys/keyring.c +1 -3
index d5264f950ce1..737e60b3d4bd 100644

Lines of this file are not shown. View the raw message.

security/keys/proc.c +3 -8
index 036128682463..f2c7e090a66d 100644

Lines of this file are not shown. View the raw message.

security/keys/request_key.c +1 -0
index 3ae3acf473c8..88172c163953 100644

Lines of this file are not shown. View the raw message.

security/keys/request_key_auth.c +1 -1
index 217775fcd0f3..8882b729924d 100644

Lines of this file are not shown. View the raw message.

security/lsm_audit.c +6 -4
index cccbf3068cdc..331fd3bd0f39 100644

Lines of this file are not shown. View the raw message.

sound/core/compress_offload.c +2 -1
index 6163bf3e8177..2272aee12871 100644

Lines of this file are not shown. View the raw message.

sound/firewire/bebob/bebob.c +13 -1
index 1898fa4228ad..3a0361458597 100644

Lines of this file are not shown. View the raw message.

sound/soc/fsl/fsl_esai.c +4 -3
index e8adead8be00..a87836d4de15 100644

Lines of this file are not shown. View the raw message.

sound/soc/fsl/imx-audmux.c +12 -12
index fc57da341d61..136df38c4536 100644

Lines of this file are not shown. View the raw message.

sound/soc/intel/boards/broadwell.c +1 -1
index 3f8a1e10bed0..e5ca41ffa890 100644

Lines of this file are not shown. View the raw message.

sound/soc/intel/boards/haswell.c +1 -1
index 22558572cb9c..de955c2e8c4e 100644

Lines of this file are not shown. View the raw message.

sound/soc/soc-dapm.c +5 -5
index 0aefed8ab0cf..7e26d173da41 100644

Lines of this file are not shown. View the raw message.

sound/soc/soc-topology.c +7 -1
index c1e76feb3529..824f4d7fc41f 100644

Lines of this file are not shown. View the raw message.

tools/arch/x86/include/asm/cpufeatures.h new file +336 -0

336 lines not on this page · raw message

tools/arch/x86/include/asm/disabled-features.h new file +65 -0

65 lines not on this page · raw message

tools/arch/x86/include/asm/required-features.h new file +106 -0

106 lines not on this page · raw message

tools/arch/x86/lib/memcpy_64.S new file +179 -0

179 lines not on this page · raw message

tools/arch/x86/lib/memset_64.S new file +138 -0

138 lines not on this page · raw message

tools/include/asm/alternative-asm.h new file +9 -0
new file mode 100644
index 000000000000..2a4d1bfa2988

Lines of this file are not shown. View the raw message.

tools/perf/MANIFEST +6 -2
index 39c38cb45b00..358b810057d6 100644

Lines of this file are not shown. View the raw message.

tools/perf/Makefile.perf +15 -0
index b67e006d56cc..7e0837579f40 100644

Lines of this file are not shown. View the raw message.

tools/perf/bench/mem-memcpy-x86-64-asm.S +1 -1
index e4c2c30143b9..9d82c44a6d71 100644

Lines of this file are not shown. View the raw message.

tools/perf/bench/mem-memset-x86-64-asm.S +1 -1
index de278784c866..58407aa24c1b 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/auxtrace.c +2 -2
index 58426e7d320d..4b898b15643d 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/auxtrace.h +3 -0
index b86f90db1352..b6d6ccf630d9 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/cpumap.c +9 -2
index 10af1e7524fb..f1aae86f7f6c 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/include/asm/alternative-asm.h deleted +0 -9
deleted file mode 100644
index 3a3a0f16456a..000000000000

Lines of this file are not shown. View the raw message.

tools/perf/util/intel-pt-decoder/intel-pt-decoder.c +34 -3
index dc17c881275d..d01e2ce818f7 100644

Lines of this file are not shown. View the raw message.

tools/perf/util/symbol-elf.c +8 -1
index 7c97ecaeae48..2070c02de3af 100644

Lines of this file are not shown. View the raw message.

virt/kvm/arm/vgic.c +0 -7
index 5d10f104f3eb..964df643509d 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.