From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S967258AbcCQAII (ORCPT ); Wed, 16 Mar 2016 20:08:08 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:48834 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S967098AbcCQAID (ORCPT ); Wed, 16 Mar 2016 20:08:03 -0400 Date: Wed, 16 Mar 2016 17:07:59 -0700 From: Greg KH To: Linus Torvalds , Andrew Morton , Arnd Bergmann Cc: linux-kernel@vger.kernel.org Subject: [GIT PULL] char/misc driver patches for 4.6-rc1 Message-ID: <20160317000759.GA12702@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit User-Agent: Mutt/1.5.24 (2015-08-30) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The following changes since commit fc77dbd34c5c99bce46d40a2491937c3bcbd10af: Linux 4.5-rc6 (2016-02-28 08:41:20 -0800) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git/ tags/char-misc-4.6-rc1 for you to fetch changes up to 16617535684faf9de30620de83667214297a36b8: goldfish: Fix build error of missing ioremap on UM (2016-03-05 12:33:58 -0800) ---------------------------------------------------------------- Char/Misc patches for 4.6-rc1 Here is the big char/misc driver update for 4.6-rc1. The majority of the patches here is hwtracing and some new mic drivers, but there's a lot of other driver updates as well. Full details in the shortlog. All have been in linux-next for a while with no reported issues. Signed-off-by: Greg Kroah-Hartman ---------------------------------------------------------------- Alex Bennée (1): goldfish_pipe: don't be clever with #define offsets Alex Ng (2): Drivers: hv: utils: Remove util transport handler from list if registration fails Drivers: hv: vmbus: Support kexec on ws2012 r2 and above Alexander Shishkin (21): stm class: Fix locking in unbinding policy path stm class: Fix link list locking stm class: Prevent user-controllable allocations intel_th: pci: Add Apollo Lake SOC support intel_th: pci: Add Broxton SOC support intel_th: Depend on HAS_IOMEM intel_th: gth: Remove commented-out code intel_th: Update scratchpad bits according to enabled output activity intel_th: sth: Sanitize packet callback's return values intel_th: Set root device's drvdata early intel_th: Use real device index in the node names stm class: Use driver's packet callback return value stm class: Support devices with multiple instances stm class: dummy_stm: Create multiple devices stm class: Add heartbeat stm source device stm class: Fix unlocking braino in the error path stm class: Guard output assignment against concurrency stm class: Fix unbalanced module/device refcounting stm class: Fix a race in unlinking stm class: Plug stm device's unlink callback stm class: dummy_stm: Add link callback for fault injection Alexander Usyskin (25): mei: prevent queuing new flow control credit. mei: always copy the read buffer if data is ready mei: wd: drop the watchdog code from the core mei driver mei: debugfs: adjust active clients print buffer mei: debugfs: allow hbm features list dump in earlier stages mei: call stop on failed char device register mei: amthif: don't copy from an empty buffer mei: amthif: don't drop read packets on timeout mei: amthif: allow only one request at a time mei: amthif: use rx_wait queue also for amthif client mei: amthif: interrupt reader on link reset mei: bus: check if the device is enabled before data transfer mei: drop superfluous closing bracket from write traces mei: wake blocked write on link reset mei: clean write queues and wake waiters on disconnect mei: discard replies from unconnected fixed address clients mei: fill file pointer in read cb for fixed address client mei: fixed address clients for the new platforms mei: hbm: warn about fw-initiated disconnect mei: drop reserved host client ids mei: bus: run rescan on me_clients list change mei: hbm: send immediate reply flag in enum request mei: split amthif client init from end of clients enumeration mei: fix double freeing of a cb during link reset mei: fix format string in debug prints Amitoj Kaur Chawla (1): misc: ibmasm: Replace timeval with timespec64 Andreas Kemnade (1): omap_hdq: fix usecount handling Andrew Lunn (7): nvmem: Add flag to export NVMEM to root only nvmem: Add backwards compatibility support for older EEPROM drivers. eeprom: at24: extend driver to plug into the NVMEM framework eeprom: at25: Remove in kernel API for accessing the EEPROM eeprom: at25: extend driver to plug into the NVMEM framework eeprom: 93xx46: extend driver to plug into the NVMEM framework misc: at24: replace memory_accessor with nvmem_device_read Andrew-CT Chen (3): dt-bindings: add document of mediatek efuse driver nvmem: mediatek: Add Mediatek EFUSE driver nvmem: mediatek: Fix later provider initialization Andrzej Hajda (1): drivers: char: mem: fix IS_ERROR_VALUE usage Ariel D'Alessandro (2): DT: nvmem: Add NXP LPC18xx EEPROM memory binding documentation nvmem: NXP LPC18xx EEPROM memory NVMEM driver Arnd Bergmann (5): staging: goldfish: use div64_s64 instead of do_div stm class: Select CONFIG_SRCU lkdtm: mark execute_location as noinline char: nwbutton: avoid unused variable warning char: genrtc: replace blacklist with whitelist Arve Hjønnevåg (1): android: binder: More offset validation Ashutosh Dixit (2): misc: mic: Fix crash when MIC reset is invoked in RESET_FAILED state misc: mic: Enable VOP card side functionality Axel Lin (1): nvmem: imx-ocotp: Fix return value of imx_ocotp_read Bamvor Jian Zhang (3): ppdev: convert to y2038 safe ppdev: add support for compat ioctl fs/compat: remove useless compat ioctl for parport device Ben Hutchings (1): misc/bmp085: Enable building as a module Bhumika Goyal (1): drivers: char: raw: Removed unnecessary braces Caesar Wang (2): nvmem: sunxi: trivial: fix code style nvmem: rockchip: trivial: Make the driver more readability Chanwoo Choi (1): extcon: Add the EXTCON_CHG_USB_SDP to support SDP charing port Charles Keepax (1): extcon: arizona: Use DAPM mutex helper functions Chen Feng (1): firmware: Change the page arrary alloc to vmalloc Christian Colic (2): staging: goldfish: (coding style) Add spaces around the "+" to conform to checkpatch staging: goldfish: (coding style) Rewrite comparisons to NULL as "!data->reg_base" Christoffer Dall (1): goldfish_pipe: Pin pages to memory while copying and other cleanups Chunyan Zhang (2): stm class: Fix an off-by-one in master array allocation stm class: Fix master deallocation in device unregistering Colin Ian King (1): pch_phub: return -ENODATA if ROM can't be mapped Cory Tusar (5): misc: eeprom_93xx46: Fix 16-bit read and write accesses. Documentation: devicetree: Add DT bindings to eeprom_93xx46 driver. misc: eeprom_93xx46: Implement eeprom_93xx46 DT bindings. misc: eeprom_93xx46: Add quirks to support Atmel AT93C46D device. misc: eeprom_93xx46: Add support for a GPIO 'select' line. Dan Bogdan Nechita (1): misc: ad525x_dpot: Fix the enabling of the "otpXen" attributes Dan Carpenter (6): extcon: max77843: Use correct size for reading the interrupt register misc: mic/scif: fix wrap around tests goldfish: locking bugs in goldfish_pipe_read_write() mic_virtio: fix a timeout loop misc: mic: use after free printing error message misc: mic: silence an overflow warning David S. Miller (3): sparc: Hook up copy_file_range syscall. sparc32: Add -Wa,-Av8 to KBUILD_CFLAGS. sparc64: Fix sparc64_set_context stack handling. David Windsor (1): lkdtm: add test for atomic_t underflow/overflow Dexuan Cui (7): Drivers: hv: vmbus: add a helper function to set a channel's pending send size Drivers: hv: vmbus: define the new offer type for Hyper-V socket (hvsock) Drivers: hv: vmbus: vmbus_sendpacket_ctl: hvsock: avoid unnecessary signaling Drivers: hv: vmbus: define a new VMBus message type for hvsock Drivers: hv: vmbus: add a hvsock flag in struct hv_driver Drivers: hv: vmbus: add a per-channel rescind callback Drivers: hv: vmbus: add an API vmbus_hvsock_device_unregister() Eli Billauer (1): char: xillybus: Fix internal data structure initialization Eric Biggers (1): misc: mic: fix incorrect use of error codes in SCIF DMA driver Eric Long (2): coresight: "DEVICE_ATTR_RO" should defined as static. coresight: etm4x: Check every parameter used by dma_xx_coherent. Felipe Balbi (3): extcon: palmas: Add the support for VBUS detection by using GPIO arm: boot: dts: beaglex15: Remove ID GPIO arm: boot: beaglex15: pass correct interrupt Geert Uytterhoeven (2): stm class: Hide STM-specific options if STM is disabled intel_th: INTEL_TH should depend on HAS_DMA Geliang Tang (10): extcon: Use to_i2c_client for both rt8973a and sm5502 misc: mic/scif: use list_next_entry instead of list_entry_next misc: apds990x, bh1770glc, lis3lv02d: use to_i2c_client misc: eeprom: use kobj_to_dev() misc: cxl: use kobj_to_dev() misc: c2port: use kobj_to_dev() vme: vme_ca91cx42.c: use to_pci_dev() devres: use to_pci_dev() pch_phub: use kobj_to_dev() GenWQE: use kobj_to_dev() Greg Hackmann (3): goldfish: refactor goldfish platform configs platform: goldfish: pipe: add devicetree bindings platform: goldfish: pipe: don't log when dropping PIPE_ERROR_AGAIN Greg Kroah-Hartman (4): Merge 4.5-rc4 into char-misc-next Merge 4.5-rc6 into char-misc-next Merge tag 'extcon-next-for-4.6' of git://git.kernel.org/.../chanwoo/extcon into char-misc-testing Merge tag 'lkdtm-next' of git://git.kernel.org/.../kees/linux into char-misc-testing Grygorii Strashko (1): extcon: palmas: Drop IRQF_EARLY_RESUME flag Jason Hu (1): goldfish: Enable ACPI-based enumeration for android pipe Jiri Kosina (1): w1: w1_process() is not freezable kthread Jorgen Hansen (1): VMCI: Use 32bit atomics for queue headers on X86_32 K. Y. Srinivasan (6): Drivers: hv: vmbus: Cleanup vmbus_set_event() Drivers: hv: vmbus: Add vendor and device atttributes Drivers: hv: vmbus: Eliminate the spin lock on the read path Drivers: hv: vmbus: Give control over how the ring access is serialized Drivers: hv: util: Pass the channel information during the init call Drivers: hv: vmbus: Support handling messages on multiple CPUs Kamal Mostafa (1): tools/hv: Use include/uapi with __EXPORTED_HEADERS__ Kees Cook (2): MAINTAINERS: add myself as lkdtm maintainer lkdtm: improve use-after-free tests Krzysztof Kozlowski (1): goldfish: Fix build error of missing ioremap on UM LABBE Corentin (1): char/nvram: set array of const as const Laura Abbott (3): lkdtm: Add READ_AFTER_FREE test lkdtm: Update WRITE_AFTER_FREE test lkdtm: Add read/write after free tests for buddy memory Laurent FERT (2): intel_th: msu: Fix offset for wrapped block intel_th: msu: Release resources on read error Linus Torvalds (1): Merge git://git.kernel.org/.../davem/sparc Lucas Tanure (1): stm class: Use a signed return type for stm_find_master_chan Luis R. Rodriguez (1): firmware: simplify dev_*() print messages for generic helpers Mathieu Poirier (25): coresight: fixing indentation problem coresight: fixing lockdep error coresight: coresight_unregister() function cleanup coresight: release reference taken by 'bus_find_device()' coresight: remove csdev's link from topology coresight: removing bind/unbind options from sysfs coresight: implementing 'cpu_id()' API coresight: associating path with session rather than tracer coresight: add API to get sink from path coresight: moving PM runtime operations to core framework coresight: etm3x: moving etm_readl/writel to header file coresight: etm3x: moving sysFS entries to dedicated file coresight: etm3x: unlocking tracers in default arch init coresight: etm3x: splitting struct etm_drvdata coresight: etm3x: adding operation mode for etm_enable() coresight: etm3x: set progbit to stop trace collection coresight: etm3x: changing default trace configuration coresight: etm3x: consolidating initial config coresight: etm3x: implementing user/kernel mode tracing coresight: etm3x: implementing perf_enable/disable() API coresight: etb10: moving to local atomic operations coresight: etb10: adding operation mode for sink->enable() coresight: etb10: implementing AUX API coresight: etm-perf: new PMU driver for ETM tracers coresight: introducing a global trace ID function Matthias Lange (1): scripts: fix typo in ver_linux Michael Hennerich (1): drivers/misc/ad525x_dpot: AD5274 fix RDAC read back errors Mike Frysinger (1): sparc: Fix system call tracing register handling. Miodrag Dinic (1): Enable platform support for Goldfish virtual devices Moritz Fischer (1): extcon: gpio: Fix typo in comment Paul Burton (1): misc: pch_phub: allow build on MIPS platforms Paul Gortmaker (3): drivers/misc: make arm-charlcd.c explicitly non-modular drivers/hwtracing: make coresight-* explicitly non-modular drivers/hwtracing: make coresight-etm-perf.c explicitly non-modular Rasmus Villemoes (1): nvmem: core: fix error path in nvmem_add_cells() Richard Weinberger (1): nvmem: Fix dependencies for !HAS_IOMEM archs Riley Andrews (1): android: drivers: Avoid debugfs race in binder Shraddha Barke (1): Staging: goldfish: goldfish_nand: Add DMA Support using dmam_alloc_coherent Srinivas Kandagatla (1): nvmem: core: return error for non word aligned access Stephen Boyd (1): spmi: pmic-arb: Support more than 128 peripherals Sudeep Dutt (7): misc: mic: Remove MIC X100 host virtio functionality misc: mic: Remove MIC X100 card virtio functionality misc: mic: MIC VOP Bus misc: mic: Add data structures for the VOP driver misc: mic: Enable VOP host side functionality misc: mic: Enable VOP debugfs and driver build misc: mic: MIC host and card driver changes to enable VOP Sudip Mukherjee (13): misc: mic: remove unneeded debug message misc: mic: return error properly misc: mic: return error directly misc: mic: use common error path misc: st_core: remove unreachable code ppdev: space prohibited between function name and parenthesis ppdev: remove whitespace around pointers ppdev: add missing blank line ppdev: remove braces ppdev: fix parenthesis alignment ppdev: remove space before tab ppdev: use new parport device model ppdev: use dev_* macros Tomas Winkler (18): mei: bus: remove redundant uuid string in debug messages mei: drop nfc leftovers from the mei driver watchdog: mei_wdt: implement MEI iAMT watchdog driver watchdog: mei_wdt: add status debugfs entry mei: bus: whitelist the watchdog client watchdog: mei_wdt: register wd device only if required watchdog: mei_wdt: add activation debugfs entry watchdog: mei_wdt: re-register device on event mei: trace pci configuration space io mei: fix possible integer overflow issue mei: constify struct file pointer mei: rename variable names 'file_object' to fp mei: amthif: replace amthif_rd_complete_list with rd_completed mei: amthif: drop parameter validation from mei_amthif_write mei: bus: fix RX event scheduling mei: bus: fix notification event delivery mei: wd: drop AGAIN the watchdog code from the core mei driver mei: me: add broxton pci device ids Vitaly Kuznetsov (7): Drivers: hv: vmbus: avoid infinite loop in init_vp_index() Drivers: hv: vmbus: avoid scheduling in interrupt context in vmbus_initiate_unload() Drivers: hv: vmbus: don't manipulate with clocksources on crash Drivers: hv: vmbus: don't loose HVMSG_TIMER_EXPIRED messages Drivers: hv: vmbus: avoid wait_for_completion() on crash Drivers: hv: vmbus: remove code duplication in message handling Drivers: hv: vmbus: avoid unneeded compiler optimizations in vmbus_wait_for_unload() Yu Ning (1): goldfish_pipe: Pass physical addresses to the device if supported wim.coekaerts@oracle.com (1): Add sun4v_wdt watchdog driver Documentation/ABI/stable/sysfs-bus-vmbus | 14 + .../devicetree/bindings/goldfish/pipe.txt | 17 + .../devicetree/bindings/misc/eeprom-93xx46.txt | 25 + .../devicetree/bindings/nvmem/lpc1857-eeprom.txt | 28 + .../devicetree/bindings/nvmem/mtk-efuse.txt | 36 + Documentation/mic/mic_overview.txt | 54 +- Documentation/mic/mpssd/mpss | 2 +- Documentation/mic/mpssd/mpssd.c | 2 +- Documentation/misc-devices/mei/mei.txt | 12 +- Documentation/watchdog/watchdog-parameters.txt | 4 + MAINTAINERS | 6 + arch/arm/boot/dts/am57xx-beagle-x15.dts | 3 +- arch/arm/mach-davinci/board-mityomapl138.c | 5 +- arch/arm/mach-davinci/common.c | 4 +- arch/sparc/Makefile | 6 + arch/sparc/include/uapi/asm/unistd.h | 3 +- arch/sparc/kernel/entry.S | 17 + arch/sparc/kernel/hvcalls.S | 3 +- arch/sparc/kernel/signal_64.c | 2 +- arch/sparc/kernel/sparc_ksyms_64.c | 1 + arch/sparc/kernel/syscalls.S | 36 + arch/sparc/kernel/systbls_32.S | 2 +- arch/sparc/kernel/systbls_64.S | 4 +- drivers/android/binder.c | 26 +- drivers/base/firmware_class.c | 17 +- drivers/char/Kconfig | 3 +- drivers/char/mem.c | 2 +- drivers/char/nvram.c | 12 +- drivers/char/nwbutton.c | 5 +- drivers/char/ppdev.c | 397 +++-- drivers/char/raw.c | 4 +- drivers/char/xillybus/xillybus_core.c | 4 +- drivers/extcon/extcon-arizona.c | 4 +- drivers/extcon/extcon-gpio.c | 2 +- drivers/extcon/extcon-max14577.c | 3 + drivers/extcon/extcon-max77693.c | 12 +- drivers/extcon/extcon-max77843.c | 5 +- drivers/extcon/extcon-max8997.c | 3 + drivers/extcon/extcon-palmas.c | 54 +- drivers/extcon/extcon-rt8973a.c | 8 +- drivers/extcon/extcon-sm5502.c | 8 +- drivers/hv/channel.c | 36 +- drivers/hv/channel_mgmt.c | 262 ++- drivers/hv/connection.c | 20 +- drivers/hv/hv.c | 36 +- drivers/hv/hv_fcopy.c | 2 +- drivers/hv/hv_kvp.c | 2 +- drivers/hv/hv_snapshot.c | 2 +- drivers/hv/hv_util.c | 1 + drivers/hv/hv_utils_transport.c | 3 + drivers/hv/hyperv_vmbus.h | 36 +- drivers/hv/ring_buffer.c | 31 +- drivers/hv/vmbus_drv.c | 117 +- drivers/hwtracing/coresight/Kconfig | 1 + drivers/hwtracing/coresight/Makefile | 4 +- drivers/hwtracing/coresight/coresight-etb10.c | 293 +++- drivers/hwtracing/coresight/coresight-etm-perf.c | 393 +++++ drivers/hwtracing/coresight/coresight-etm-perf.h | 32 + drivers/hwtracing/coresight/coresight-etm.h | 142 +- .../hwtracing/coresight/coresight-etm3x-sysfs.c | 1272 ++++++++++++++ drivers/hwtracing/coresight/coresight-etm3x.c | 1737 ++++---------------- drivers/hwtracing/coresight/coresight-etm4x.c | 37 +- drivers/hwtracing/coresight/coresight-funnel.c | 21 +- drivers/hwtracing/coresight/coresight-priv.h | 15 + .../coresight/coresight-replicator-qcom.c | 19 +- drivers/hwtracing/coresight/coresight-replicator.c | 25 +- drivers/hwtracing/coresight/coresight-tmc.c | 35 +- drivers/hwtracing/coresight/coresight-tpiu.c | 23 +- drivers/hwtracing/coresight/coresight.c | 388 +++-- drivers/hwtracing/coresight/of_coresight.c | 3 +- drivers/hwtracing/intel_th/Kconfig | 1 + drivers/hwtracing/intel_th/core.c | 30 +- drivers/hwtracing/intel_th/gth.c | 32 +- drivers/hwtracing/intel_th/gth.h | 3 - drivers/hwtracing/intel_th/intel_th.h | 41 + drivers/hwtracing/intel_th/msu.c | 9 +- drivers/hwtracing/intel_th/pci.c | 12 +- drivers/hwtracing/intel_th/sth.c | 11 +- drivers/hwtracing/stm/Kconfig | 16 + drivers/hwtracing/stm/Makefile | 2 + drivers/hwtracing/stm/core.c | 175 +- drivers/hwtracing/stm/dummy_stm.c | 71 +- drivers/hwtracing/stm/heartbeat.c | 130 ++ drivers/hwtracing/stm/policy.c | 25 +- drivers/hwtracing/stm/stm.h | 2 + drivers/misc/Kconfig | 4 +- drivers/misc/ad525x_dpot.c | 4 +- drivers/misc/apds990x.c | 8 +- drivers/misc/arm-charlcd.c | 24 +- drivers/misc/bh1770glc.c | 8 +- drivers/misc/c2port/core.c | 8 +- drivers/misc/cxl/sysfs.c | 5 +- drivers/misc/eeprom/Kconfig | 6 + drivers/misc/eeprom/at24.c | 130 +- drivers/misc/eeprom/at25.c | 148 +- drivers/misc/eeprom/eeprom.c | 2 +- drivers/misc/eeprom/eeprom_93xx46.c | 332 +++- drivers/misc/genwqe/card_sysfs.c | 2 +- drivers/misc/ibmasm/ibmasm.h | 9 +- drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 8 +- drivers/misc/lkdtm.c | 124 +- drivers/misc/mei/Kconfig | 6 +- drivers/misc/mei/Makefile | 1 - drivers/misc/mei/amthif.c | 130 +- drivers/misc/mei/bus-fixup.c | 41 +- drivers/misc/mei/bus.c | 57 +- drivers/misc/mei/client.c | 189 +-- drivers/misc/mei/client.h | 27 +- drivers/misc/mei/debugfs.c | 65 +- drivers/misc/mei/hbm.c | 24 +- drivers/misc/mei/hw-me-regs.h | 4 + drivers/misc/mei/hw-me.c | 10 +- drivers/misc/mei/hw-txe.c | 10 +- drivers/misc/mei/hw.h | 32 +- drivers/misc/mei/init.c | 20 +- drivers/misc/mei/interrupt.c | 94 +- drivers/misc/mei/main.c | 106 +- drivers/misc/mei/mei-trace.c | 2 + drivers/misc/mei/mei-trace.h | 40 +- drivers/misc/mei/mei_dev.h | 118 +- drivers/misc/mei/pci-me.c | 7 +- drivers/misc/mei/pci-txe.c | 4 +- drivers/misc/mei/wd.c | 391 ----- drivers/misc/mic/Kconfig | 44 +- drivers/misc/mic/Makefile | 1 + drivers/misc/mic/bus/Makefile | 1 + drivers/misc/mic/bus/cosm_bus.h | 2 + drivers/misc/mic/bus/vop_bus.c | 203 +++ drivers/misc/mic/bus/vop_bus.h | 140 ++ drivers/misc/mic/card/Makefile | 1 - drivers/misc/mic/card/mic_device.c | 89 +- drivers/misc/mic/card/mic_device.h | 3 + drivers/misc/mic/card/mic_virtio.c | 634 ------- drivers/misc/mic/card/mic_virtio.h | 76 - drivers/misc/mic/card/mic_x100.c | 1 + drivers/misc/mic/cosm/cosm_main.c | 13 +- drivers/misc/mic/host/Makefile | 2 - drivers/misc/mic/host/mic_boot.c | 125 +- drivers/misc/mic/host/mic_debugfs.c | 190 --- drivers/misc/mic/host/mic_device.h | 9 +- drivers/misc/mic/host/mic_fops.c | 222 --- drivers/misc/mic/host/mic_fops.h | 32 - drivers/misc/mic/host/mic_main.c | 49 +- drivers/misc/mic/host/mic_virtio.c | 811 --------- drivers/misc/mic/host/mic_x100.c | 19 +- drivers/misc/mic/scif/scif_dma.c | 41 +- drivers/misc/mic/scif/scif_rma.c | 7 +- drivers/misc/mic/vop/Makefile | 9 + drivers/misc/mic/vop/vop_debugfs.c | 232 +++ drivers/misc/mic/vop/vop_main.c | 755 +++++++++ .../misc/mic/{host/mic_virtio.h => vop/vop_main.h} | 129 +- drivers/misc/mic/vop/vop_vringh.c | 1165 +++++++++++++ drivers/misc/pch_phub.c | 10 +- drivers/misc/ti-st/st_core.c | 1 - drivers/misc/vmw_vmci/vmci_driver.c | 2 +- drivers/nvmem/Kconfig | 24 + drivers/nvmem/Makefile | 4 + drivers/nvmem/core.c | 145 +- drivers/nvmem/imx-ocotp.c | 2 +- drivers/nvmem/lpc18xx_eeprom.c | 330 ++++ drivers/nvmem/mtk-efuse.c | 110 ++ drivers/nvmem/rockchip-efuse.c | 90 +- drivers/nvmem/sunxi_sid.c | 9 +- drivers/platform/Kconfig | 3 +- drivers/platform/goldfish/Kconfig | 19 + drivers/platform/goldfish/Makefile | 2 +- drivers/platform/goldfish/goldfish_pipe.c | 169 +- drivers/spmi/spmi-pmic-arb.c | 153 +- drivers/staging/goldfish/goldfish_audio.c | 8 +- drivers/staging/goldfish/goldfish_nand.c | 50 +- drivers/vme/bridges/vme_ca91cx42.c | 11 +- drivers/w1/masters/omap_hdq.c | 1 - drivers/w1/w1.c | 1 - drivers/watchdog/Kconfig | 26 + drivers/watchdog/Makefile | 2 + drivers/watchdog/mei_wdt.c | 724 ++++++++ drivers/watchdog/sun4v_wdt.c | 191 +++ fs/compat_ioctl.c | 22 - include/linux/amba/bus.h | 9 + include/linux/coresight-pmu.h | 39 + include/linux/coresight.h | 34 +- include/linux/davinci_emac.h | 4 +- include/linux/eeprom_93xx46.h | 9 + include/linux/hyperv.h | 96 ++ include/linux/memory.h | 11 - include/linux/mfd/palmas.h | 3 + include/linux/nvmem-provider.h | 5 +- include/linux/platform_data/at24.h | 10 +- include/linux/spi/eeprom.h | 2 - include/linux/stm.h | 10 + include/linux/vmw_vmci_defs.h | 43 +- lib/devres.c | 2 +- scripts/ver_linux | 2 +- tools/hv/Makefile | 2 + 194 files changed, 10253 insertions(+), 5745 deletions(-) create mode 100644 Documentation/devicetree/bindings/goldfish/pipe.txt create mode 100644 Documentation/devicetree/bindings/misc/eeprom-93xx46.txt create mode 100644 Documentation/devicetree/bindings/nvmem/lpc1857-eeprom.txt create mode 100644 Documentation/devicetree/bindings/nvmem/mtk-efuse.txt create mode 100644 drivers/hwtracing/coresight/coresight-etm-perf.c create mode 100644 drivers/hwtracing/coresight/coresight-etm-perf.h create mode 100644 drivers/hwtracing/coresight/coresight-etm3x-sysfs.c create mode 100644 drivers/hwtracing/stm/heartbeat.c delete mode 100644 drivers/misc/mei/wd.c create mode 100644 drivers/misc/mic/bus/vop_bus.c create mode 100644 drivers/misc/mic/bus/vop_bus.h delete mode 100644 drivers/misc/mic/card/mic_virtio.c delete mode 100644 drivers/misc/mic/card/mic_virtio.h delete mode 100644 drivers/misc/mic/host/mic_fops.c delete mode 100644 drivers/misc/mic/host/mic_fops.h delete mode 100644 drivers/misc/mic/host/mic_virtio.c create mode 100644 drivers/misc/mic/vop/Makefile create mode 100644 drivers/misc/mic/vop/vop_debugfs.c create mode 100644 drivers/misc/mic/vop/vop_main.c rename drivers/misc/mic/{host/mic_virtio.h => vop/vop_main.h} (58%) create mode 100644 drivers/misc/mic/vop/vop_vringh.c create mode 100644 drivers/nvmem/lpc18xx_eeprom.c create mode 100644 drivers/nvmem/mtk-efuse.c create mode 100644 drivers/watchdog/mei_wdt.c create mode 100644 drivers/watchdog/sun4v_wdt.c create mode 100644 include/linux/coresight-pmu.h