1. 08 Oct, 2014 13 commits
    • Linus Torvalds's avatar
      Merge tag 'compress-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core · 3fc1479c
      Linus Torvalds authored
      Pull compression update from Greg KH:
       "More fun with the LZO compression code.  Here's some patches that
        properly document what the logic is, and fix up all of the previously
        reported issues against the LZO code.
      
        This has been in linux-next for a while with no issues"
      
      * tag 'compress-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        lzo: check for length overrun in variable length encoding.
        Revert "lzo: properly check for overruns"
        Documentation: lzo: document part of the encoding
      3fc1479c
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.18-rc1' of... · bca51651
      Linus Torvalds authored
      Merge tag 'driver-core-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core update from Greg KH:
       "Here's the driver core patches for 3.18-rc1.  Just a few small things,
        and the addition of a new interface to dump firmware "core dumps" to
        userspace through sysfs that the wireless and graphic drivers want to
        use.
      
        All of these have been in linux-next for a while"
      
      * tag 'driver-core-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        dynamic_debug: change __dynamic_<foo>_dbg return types to void
        driver/base/node: remove unnecessary kfree of node struct from unregister_one_node
        devres: Improve devm_kasprintf()/kvasprintf() support
        Documentation: devres: Add missing devm_kstrdup() managed interface
        Documentation: devres: Add missing IRQ functions
        firmware_class: make sure fw requests contain a name
        driver core: Remove kerneldoc from local function
        attribute_container: fix coding style issues
        attribute_container: fix whitespace errors
        drivers/base: Fix length checks in create_syslog_header()/dev_vprintk_emit()
        device coredump: add new device coredump class
        Documentation/sysfs-rules.txt: Add device attribute error code documentation
      bca51651
    • Linus Torvalds's avatar
      Merge tag 'tty-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 683a52a1
      Linus Torvalds authored
      Pull tty/serial driver updates from Greg KH:
       "Here's the big tty/serial driver patchset for 3.18-rc1.
      
        Lots of little things in here, some good work from Peter Hurley on the
        tty core, and in lots of drivers.  There are also lots of other driver
        updates in here as well, full details in the changelogs.
      
        All have been in the linux-next tree for a while"
      
      * tag 'tty-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (99 commits)
        Revert "serial/core: Initialize the console pm state"
        tty: serial: 8250: use 32bit variable for rpm_tx_active
        tty: serial: msm: Add earlycon support
        serial/core: Initialize the console pm state
        serial: asc: Conditionally use readl_relaxed (COMPILE_TEST)
        serial: of-serial: add PM suspend/resume support
        m68k: AMIGA_BUILTIN_SERIAL should depend on TTY
        asm/uapi: Add definition of TIOC[SG]RS485
        tty/metag_da: Add console_poll module parameter
        serial: 8250_pci: remove rts_n override from Baytrail quirk
        serial: cadence: Add generic earlycon support
        serial: imx: change the wait even to interruptiable
        serial: imx: terminate the RX DMA when the UART is suspending
        serial: imx: fix throttle/unthrottle callbacks for hardware assisted flow control
        serial: 8250: Add Quark X1000 to 8250_pci.c
        tty: omap-serial: pull out calculation from baud_is_mode16
        tty: omap-serial: fix division by zero
        xen_hvc: no reason to write the type key on xenstore
        tty: serial: 8250_core: remove UART_IER_RDI in serial8250_stop_rx()
        tty: serial: 8250_core: use the ->line argument as a hint in serial8250_find_match_or_unused()
        ...
      683a52a1
    • Linus Torvalds's avatar
      Merge tag 'staging-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · b9af5643
      Linus Torvalds authored
      Pull staging updates from Greg KH:
       "Here is the big staging patch set for 3.18-rc1.
      
        Once again, we are deleting more code than we added, with something
        like 150000 lines deleted overall.  Some of this is due to drivers
        being added to the networking tree, so the old versions are removed
        here, but even then, the overall difference is quite good.
      
        Other than driver deletions, lots and lots and lots of minor cleanups
        all over the place.  Full details are in the changelog"
      
      * tag 'staging-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (1481 commits)
        staging: et131x: Remove et131x driver from drivers/staging
        staging: emxx_udc: Use min_t instead of min
        staging: emxx_udc: Fix replace printk(KERN_DEBUG ..) with dev_dbg
        staging: media: Fixed else after return or break warning
        staging: media: omap4iss: Fixed else after return or break warning
        staging: rtl8712: Fixed else not required after return
        staging: rtl8712: Fix missing blank line warning
        staging: rtl8192e: rtl8192e: Remove spaces before the semicolons
        staging: rtl8192e: rtl8192e: Remove unnecessary return statements
        staging: rtl8192e: Remove unneeded void return
        staging: rtl8192e: Fix void function return statements style
        staging: rtl8712: Fix unnecessary parentheses style warning
        staging: rtl8192e: Fix unnecessary space before function pointer arguments
        staging: rtl8192e: Array was made static const char * const
        staging: ft1000: ft1000-usb: Removed unnecessary else statement.
        staging: ft1000: ft1000-usb: Removed unnecessary else statement.
        staging: ft1000: ft1000-usb: Removed unnecessary parentheses.
        staging: ft1000: ft1000-usb: Added new line after declarations.
        staging: vt6655: Fixed C99 // comment errors in wpactl.c
        staging: speakup: Fixed warning <linux/serial.h> instead of <asm/serial.h>
        ...
      b9af5643
    • Linus Torvalds's avatar
      Merge tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 46331196
      Linus Torvalds authored
      Pull USB updates from Greg KH:
       "Here's the big USB patchset for 3.18-rc1.  Also in here is the PHY
        tree, as it seems to fit well with the USB tree for various reasons...
      
        Anyway, lots of little changes in here, all over the place, full
        details in the changelog
      
        All have been in the linux-next tree for a while with no issues"
      
      * tag 'usb-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (244 commits)
        USB: host: st: fix typo 'CONFIG_USB_EHCI_HCD_ST'
        uas: Reduce number of function arguments for uas_alloc_foo functions
        xhci: Allow xHCI drivers to be built as separate modules
        xhci: Export symbols used by host-controller drivers
        xhci: Check for XHCI_COMP_MODE_QUIRK when disabling D3cold
        xhci: Introduce xhci_init_driver()
        usb: hcd: add generic PHY support
        usb: rename phy to usb_phy in HCD
        usb: gadget: uvc: fix up uvcg_v4l2_get_unmapped_area typo
        USB: host: st: fix ehci/ohci driver selection
        usb: host: ehci-exynos: Remove unnecessary usb-phy support
        usb: core: return -ENOTSUPP for all targeted hosts
        USB: Remove .owner field for driver
        usb: core: log higher level message on malformed LANGID descriptor
        usb: Add LED triggers for USB activity
        usb: Rename usb-common.c
        usb: gadget: Refactor request completion
        usb: gadget: Introduce usb_gadget_giveback_request()
        usb: dwc2/gadget: move phy bus legth initialization
        phy: remove .owner field for drivers using module_platform_driver
        ...
      46331196
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 87d7bcee
      Linus Torvalds authored
      Pull crypto update from Herbert Xu:
       - add multibuffer infrastructure (single_task_running scheduler helper,
         OKed by Peter on lkml.
       - add SHA1 multibuffer implementation for AVX2.
       - reenable "by8" AVX CTR optimisation after fixing counter overflow.
       - add APM X-Gene SoC RNG support.
       - SHA256/SHA512 now handles unaligned input correctly.
       - set lz4 decompressed length correctly.
       - fix algif socket buffer allocation failure for 64K page machines.
       - misc fixes
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (47 commits)
        crypto: sha - Handle unaligned input data in generic sha256 and sha512.
        Revert "crypto: aesni - disable "by8" AVX CTR optimization"
        crypto: aesni - remove unused defines in "by8" variant
        crypto: aesni - fix counter overflow handling in "by8" variant
        hwrng: printk replacement
        crypto: qat - Removed unneeded partial state
        crypto: qat - Fix typo in name of tasklet_struct
        crypto: caam - Dynamic allocation of addresses for various memory blocks in CAAM.
        crypto: mcryptd - Fix typos in CRYPTO_MCRYPTD description
        crypto: algif - avoid excessive use of socket buffer in skcipher
        arm64: dts: add random number generator dts node to APM X-Gene platform.
        Documentation: rng: Add X-Gene SoC RNG driver documentation
        hwrng: xgene - add support for APM X-Gene SoC RNG support
        crypto: mv_cesa - Add missing #define
        crypto: testmgr - add test for lz4 and lz4hc
        crypto: lz4,lz4hc - fix decompression
        crypto: qat - Use pci_enable_msix_exact() instead of pci_enable_msix()
        crypto: drbg - fix maximum value checks on 32 bit systems
        crypto: drbg - fix sparse warning for cpu_to_be[32|64]
        crypto: sha-mb - sha1_mb_alg_state can be static
        ...
      87d7bcee
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 0223f9aa
      Linus Torvalds authored
      Pull m68k updates from Geert Uytterhoeven:
       "Summary:
        - a fix for an intermittent crash in macsonic and hilkbd, marked for
          stable,
        - build fixes for uncommon configs.
      
        Note: "m68k: AMIGA_BUILTIN_SERIAL should depend on TTY" was also
        picked up by GregKH for his TTY/Serial patches tree"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Reformat arch/m68k/mm/hwtest.c
        m68k: Disable/restore interrupts in hwreg_present()/hwreg_write()
        m68k: AMIGA_BUILTIN_SERIAL should depend on TTY
        m68k: Add missing ioport_unmap()
        m68k/atari - stram: Add missing #include <linux/ioport.h>
      0223f9aa
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20141006' of git://github.com/sctscore/linux-off · 8a9e838f
      Linus Torvalds authored
      Pull S+core updates from Lennox Wu:
       "Three of the patches are for building allmodconfig, and the others are
        for removing useless flags"
      
      * tag 'for-linus-20141006' of git://github.com/sctscore/linux-off:
        score: Remove GENERIC_HAS_IOMAP
        arch/score/include/asm/Kbuild: Add generic "serial.h"
        score: remove deprecated IRQF_DISABLED
        arch/score/mm/cache.c: Export 'flush_icache_range'
        arch: score: Export necessary symbols in related files
      8a9e838f
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · f8e4fae2
      Linus Torvalds authored
      Pull arch/tile updates from Chris Metcalf:
       "The only substantive pieces in this batch are some more vDSO support,
        and removing the reference to &platform_bus in tile-srom.c.
      
        The rest are minor issues reported to me"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        tile: add clock_gettime support to vDSO
        tile: switch to using seqlocks for the vDSO time code
        tile gxio: use better string copy primitive
        char: tile-srom: Add real platform bus parent
        Removed repeated word in comments
        tilegx: Enable ARCH_SUPPORTS_ATOMIC_RMW
        tile: Remove tile-specific _sinitdata and _einitdata
        tile: use ARRAY_SIZE
      f8e4fae2
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 6325e940
      Linus Torvalds authored
      Pull arm64 updates from Catalin Marinas:
       - eBPF JIT compiler for arm64
       - CPU suspend backend for PSCI (firmware interface) with standard idle
         states defined in DT (generic idle driver to be merged via a
         different tree)
       - Support for CONFIG_DEBUG_SET_MODULE_RONX
       - Support for unmapped cpu-release-addr (outside kernel linear mapping)
       - set_arch_dma_coherent_ops() implemented and bus notifiers removed
       - EFI_STUB improvements when base of DRAM is occupied
       - Typos in KGDB macros
       - Clean-up to (partially) allow kernel building with LLVM
       - Other clean-ups (extern keyword, phys_addr_t usage)
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (51 commits)
        arm64: Remove unneeded extern keyword
        ARM64: make of_device_ids const
        arm64: Use phys_addr_t type for physical address
        aarch64: filter $x from kallsyms
        arm64: Use DMA_ERROR_CODE to denote failed allocation
        arm64: Fix typos in KGDB macros
        arm64: insn: Add return statements after BUG_ON()
        arm64: debug: don't re-enable debug exceptions on return from el1_dbg
        Revert "arm64: dmi: Add SMBIOS/DMI support"
        arm64: Implement set_arch_dma_coherent_ops() to replace bus notifiers
        of: amba: use of_dma_configure for AMBA devices
        arm64: dmi: Add SMBIOS/DMI support
        arm64: Correct ftrace calls to aarch64_insn_gen_branch_imm()
        arm64:mm: initialize max_mapnr using function set_max_mapnr
        setup: Move unmask of async interrupts after possible earlycon setup
        arm64: LLVMLinux: Fix inline arm64 assembly for use with clang
        arm64: pageattr: Correctly adjust unaligned start addresses
        net: bpf: arm64: fix module memory leak when JIT image build fails
        arm64: add PSCI CPU_SUSPEND based cpu_suspend support
        arm64: kernel: introduce cpu_init_idle CPU operation
        ...
      6325e940
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm · 536fd93d
      Linus Torvalds authored
      Pull ARM updates from Russell King:
       "Included in these updates are:
         - Performance optimisation to avoid writing the control register at
           every exception.
         - Use static inline instead of extern inline in ftrace code.
         - Crypto ARM assembly updates for big endian
         - Alignment of initrd/.init memory to page sizes when freeing to
           ensure that we fully free the regions
         - Add gcov support
         - A couple of preparatory patches for VDSO support: use
           _install_special_mapping, and randomize the sigpage placement above
           stack.
         - Add L2 ePAPR DT cache properties so that DT can specify the cache
           geometry.
         - Preparatory patch for FIQ (NMI) kernel C code for things like
           spinlock lockup debug.  Following on from this are a couple of my
           patches cleaning up show_regs() and removing an unused (probably
           since 1.x days) do_unexp_fiq() function.
         - Use pr_warn() rather than pr_warning().
         - A number of cleanups (smp, footbridge, return_address)"
      
      * 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (21 commits)
        ARM: 8167/1: extend the reserved memory for initrd to be page aligned
        ARM: 8168/1: extend __init_end to a page align address
        ARM: 8169/1: l2c: parse cache properties from ePAPR definitions
        ARM: 8160/1: drop warning about return_address not using unwind tables
        ARM: 8161/1: footbridge: select machine dir based on ARCH_FOOTBRIDGE
        ARM: 8158/1: LLVMLinux: use static inline in ARM ftrace.h
        ARM: 8155/1: place sigpage at a random offset above stack
        ARM: 8154/1: use _install_special_mapping for sigpage
        ARM: 8153/1: Enable gcov support on the ARM architecture
        ARM: Avoid writing to control register on every exception
        ARM: 8152/1: Convert pr_warning to pr_warn
        ARM: remove unused do_unexp_fiq() function
        ARM: remove extraneous newline in show_regs()
        ARM: 8150/3: fiq: Replace default FIQ handler
        ARM: 8140/1: ep93xx: Enable DEBUG_LL_UART_PL01X
        ARM: 8139/1: versatile: Enable DEBUG_LL_UART_PL01X
        ARM: 8138/1: drop ISAR0 workaround for B15
        ARM: 8136/1: sa1100: add Micro ASIC platform device
        ARM: 8131/1: arm/smp: Absorb boot_secondary()
        ARM: 8126/1: crypto: enable NEON SHA-384/SHA-512 for big endian
        ...
      536fd93d
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · e4e65676
      Linus Torvalds authored
      Pull KVM updates from Paolo Bonzini:
       "Fixes and features for 3.18.
      
        Apart from the usual cleanups, here is the summary of new features:
      
         - s390 moves closer towards host large page support
      
         - PowerPC has improved support for debugging (both inside the guest
           and via gdbstub) and support for e6500 processors
      
         - ARM/ARM64 support read-only memory (which is necessary to put
           firmware in emulated NOR flash)
      
         - x86 has the usual emulator fixes and nested virtualization
           improvements (including improved Windows support on Intel and
           Jailhouse hypervisor support on AMD), adaptive PLE which helps
           overcommitting of huge guests.  Also included are some patches that
           make KVM more friendly to memory hot-unplug, and fixes for rare
           caching bugs.
      
        Two patches have trivial mm/ parts that were acked by Rik and Andrew.
      
        Note: I will soon switch to a subkey for signing purposes"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (157 commits)
        kvm: do not handle APIC access page if in-kernel irqchip is not in use
        KVM: s390: count vcpu wakeups in stat.halt_wakeup
        KVM: s390/facilities: allow TOD-CLOCK steering facility bit
        KVM: PPC: BOOK3S: HV: CMA: Reserve cma region only in hypervisor mode
        arm/arm64: KVM: Report correct FSC for unsupported fault types
        arm/arm64: KVM: Fix VTTBR_BADDR_MASK and pgd alloc
        kvm: Fix kvm_get_page_retry_io __gup retval check
        arm/arm64: KVM: Fix set_clear_sgi_pend_reg offset
        kvm: x86: Unpin and remove kvm_arch->apic_access_page
        kvm: vmx: Implement set_apic_access_page_addr
        kvm: x86: Add request bit to reload APIC access page address
        kvm: Add arch specific mmu notifier for page invalidation
        kvm: Rename make_all_cpus_request() to kvm_make_all_cpus_request() and make it non-static
        kvm: Fix page ageing bugs
        kvm/x86/mmu: Pass gfn and level to rmapp callback.
        x86: kvm: use alternatives for VMCALL vs. VMMCALL if kernel text is read-only
        kvm: x86: use macros to compute bank MSRs
        KVM: x86: Remove debug assertion of non-PAE reserved bits
        kvm: don't take vcpu mutex for obviously invalid vcpu ioctls
        kvm: Faults which trigger IO release the mmap_sem
        ...
      e4e65676
    • Linus Torvalds's avatar
      Fix up missing dmaengine header inclusion from qce crypto engine · f89f4a06
      Linus Torvalds authored
      Commit 7bced397
      
       ("net_dma: simple removal") removed the long-dead
      net_dma code, but unintentionally broke the build for the qualcomm
      crypto engine (qce) that had accidentally depended on the inclusion of
      <linux/dmaengine.h> through the networking header files that used to
      have it.
      
      Add the required dmaengine.h include explicitly to fix the breakage.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f89f4a06
  2. 07 Oct, 2014 19 commits
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 9a50aaef
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This patch set consists of the usual driver updates (megaraid_sas,
        arcmsr, be2iscsi, lpfc, mpt2sas, mpt3sas, qla2xxx, ufs) plus several
        assorted fixes and miscellaneous updates (including the
        pci_msix_enable_range() changes that have been pending for a while)"
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (202 commits)
        scsi: add a CONFIG_SCSI_MQ_DEFAULT option
        ufs: definitions for phy interface
        ufs: tune bkops while power managment events
        ufs: Add support for clock scaling using devfreq framework
        ufs: Add freq-table-hz property for UFS device
        ufs: Add support for clock gating
        ufs: refactor configuring power mode
        ufs: add UFS power management support
        ufs: introduce well known logical unit in ufs
        ufs: manually add well known logical units
        ufs: Active Power Mode - configuring bActiveICCLevel
        ufs: improve init sequence
        ufs: refactor query descriptor API support
        ufs: add voting support for host controller power
        ufs: Add clock initialization support
        ufs: Add regulator enable support
        ufs: Allow vendor specific initialization
        scsi: don't add scsi_device if its already visible
        scsi: fix the type for well known LUs
        scsi: fix comment in struct Scsi_Host definition
        ...
      9a50aaef
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input · 1e345ac6
      Linus Torvalds authored
      Pull input updates from Dmitry Torokhov:
       "A few new haptic/button drivers, a rudimentary support for laptops
        using FocalTech touchpads; xpad driver will bind to more devices, and
        a few other driver fixes."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
        Input: soc_button_array - convert to platform bus
        Input: palmas-pwrbutton - fix typo in the license string
        Input: palmas-pwrbutton - use IRQF_ONESHOT
        Input: psmouse - add support for detecting FocalTech PS/2 touchpads
        Input: psmouse - add psmouse_matches_pnp_id helper function
        Input: joystick - use ktime for measuring timing
        Input: add haptic driver on max77693
        Input: introduce palmas-pwrbutton
        Input: add support for the DRV2667 haptic driver
        Input: xpad - sync device IDs with xboxdrv
        Input: xpad - add VID/PID for Razer Sabertooth
        Input: cros_ec_keyb - optimize ghosting algorithm
        Input: drv260x - fix binding document
        Input: drv260x - add check for ERM mode and LRA Libraries
        Input: drv260x - remove unused defines
        Input: drv260x - add TI drv260x haptics driver
      1e345ac6
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 39520eea
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
      
       - quirk for devices that need to be pulled in much more aggresive way
         than mandated, by Johan Hovold
      
       - robustification of sanity checking of incoming reports in RMI driver,
         by Benjamin Tissoires
      
       - fixes, updates, and new HW support to SONY driver, by Frank Praznik
      
       - port of uHID to the new transport layer layout, by David Herrmann
      
       - robustification of Clear-Halt/reset in USB HID, by Alan Stern
      
       - native support for hopefully any future HID compliant wacom tablet.
         Those found on the various laptops (ISDv4/5) already are HID
         compliant and they should work in the future without any modification
         of the kernel.  Written by Benjamin Tissoires.
      
       - a lot more simple fixes and device ID additions all over the place
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (45 commits)
        HID: uHID: fix excepted report type
        HID: usbhid: add another mouse that needs QUIRK_ALWAYS_POLL
        HID: wacom: implement the finger part of the HID generic handling
        HID: wacom: implement generic HID handling for pen generic devices
        HID: wacom: move allocation of inputs earlier
        HID: wacom: split out input allocation and registration
        HID: wacom: rename failN with some meaningful information
        HID: sony: Update the DualShock 4 touchpad resolution
        HID: wacom: fix timeout on probe for some wacoms
        HID: sony: Set touchpad bits in the input_configured callback
        HID: sony: Update file header and correct comments
        HID: sony: Corrections for the DualShock 4 HID descriptor
        HID: rmi: check sanity of the incoming report
        HID: wacom: make the WL connection friendly for the desktop
        HID: wacom - enable LED support for Wireless Intuos5/Pro
        HID: wacom - remove report_id from wacom_get_report interface
        HID: wacom - Clean up of sysfs
        HID: wacom - Add default permission defines for sysfs attributes
        HID: usbhid: fix PIXART optical mouse
        HID: Add Holtek USB ID 04d9:a0c2 ETEKCITY Scroll
        ...
      39520eea
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 28596c97
      Linus Torvalds authored
      Pull "trivial tree" updates from Jiri Kosina:
       "Usual pile from trivial tree everyone is so eagerly waiting for"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
        Remove MN10300_PROC_MN2WS0038
        mei: fix comments
        treewide: Fix typos in Kconfig
        kprobes: update jprobe_example.c for do_fork() change
        Documentation: change "&" to "and" in Documentation/applying-patches.txt
        Documentation: remove obsolete pcmcia-cs from Changes
        Documentation: update links in Changes
        Documentation: Docbook: Fix generated DocBook/kernel-api.xml
        score: Remove GENERIC_HAS_IOMAP
        gpio: fix 'CONFIG_GPIO_IRQCHIP' comments
        tty: doc: Fix grammar in serial/tty
        dma-debug: modify check_for_stack output
        treewide: fix errors in printk
        genirq: fix reference in devm_request_threaded_irq comment
        treewide: fix synchronize_rcu() in comments
        checkstack.pl: port to AArch64
        doc: queue-sysfs: minor fixes
        init/do_mounts: better syntax description
        MIPS: fix comment spelling
        powerpc/simpleboot: fix comment
        ...
      28596c97
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc · b6420ebd
      Linus Torvalds authored
      Pull documentation updates from Jiri Kosina:
       "Updates to kernel documentation.
      
        I took this over (hopefully temporarily) from Randy who was not
        willing to maintain it any longer.  This pile mostly is a relay of
        queue that Randy already had in his tree"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/doc:
        Documentation: fix broken v4l-utils URL
        Documentation: update include path for mpssd
        Documentation: correct parameter error for dma_mapping_error
        MAINTAINERS: update location of linux-doc tree
        Documentation: remove networking/.gitignore
        tools: add more endian.h macros
        Make Documenation depend on headers_install
        Docs: this_cpu_ops: remove redundant add forms
        Documentation: disable vdso_test to avoid breakage with old glibc
        Documentation: update vDSO makefile to build portable examples
        Documentation: update .gitignore files
        Documentation: support glibc versions without htole macros
        v4l2-pci-skeleton: Only build if PCI is available
        Documentation: fix misc. warnings
        Documentation: make functions static to avoid prototype warnings
        Documentation: add makefiles for more targets
        Documentation: use subdir-y to avoid unnecessary built-in.o files
      b6420ebd
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · d2901069
      Linus Torvalds authored
      Pull spi updates from Mark Brown:
       "A quiet release for SPI, mainly driver updates and not too many of
        them:
      
         - Support for dummy transfers (for delays on startup) in drivers
           using transfer_one().
         - Lots of enhancements to the Designware driver to support new Intel
           SoCs.
         - Support for newer Renesas chips.
         - DMA support for the i.MX driver.
         - One new driver for Broadcom BCM53xx chips"
      
      * tag 'spi-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (64 commits)
        spi: spi-mxs: fix a tiny typo in a comment
        spi: dw-mid: follow new DMAengine workflow
        spi: dw-mid: convert to use DMAengine wrappers
        spi: dw-mid: change magic numbers to the constants
        spi: orion: support armada extended baud rates
        spi: fsl: Sort include headers alphabetically
        spi: bcm53xx: Add missing module information
        spi: bcm53xx: Fix module dependency
        spi/rockchip: fix bug that cause the failure to read data in DMA mode
        spi: fsl-dspi: Remove probe info message
        spi: pl022: Add support for chip select extension
        spi: Fix possible ZERO_SIZE_PTR pointer dereferencing error.
        spi: dw: fix style of code in few places
        spi: dw: introduce support of loopback mode
        spi: dw-mid: terminate ongoing transfers at exit
        spi: dw-mid: respect 8 bit mode
        spi: clps711x: Migrate to the new clk subsystem
        spi: pl022: Add missing error check for devm_kzalloc
        spi: spi-imx: add DMA support
        spi: davinci: add support for adding delay between word's transmissions
        ...
      d2901069
    • Linus Torvalds's avatar
      Merge tag 'regulator-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 81e29b7d
      Linus Torvalds authored
      Pull regulator updates from Mark Brown:
       "This time around most of the changes are a lot of new drivers along
        with the standard set of fixes and cleanups (thanks again largely to
        Axel Lin).  We do have one nice new feature in the core which factors
        out the disappointingly tricky code around DT parsing, only a couple
        of drivers have been converted so far:
      
         - Factor out the code for parsing the standard bindings for a set of
           regulators out of DT, making the probe part of a lot of drivers
           simplier.
         - New drivers for Dialog DA9213, HiSilicon HI6420, Intersil
           ISL9305/H, Ricoh RN5T618, Rockchip RK808, Skyworks SKY81452,
           Silergy SYR82x, and Qualcomm RPM"
      
      * tag 'regulator-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (71 commits)
        regulator: da9211: Fix a bug in update of mask bit
        regulator: pwm-regulator: add devicetree bindings for pwm regulator
        regulator: pwm-regulator: get voltage and duty table from dts
        regulator: qcom_rpm: Fix FORCE_MODE_IS_2_BITS macro
        regulator: qcom_rpm: Don't explicitly initialise the first field of config
        regulator: ltc3589: fix broken voltage transitions
        regulator: qcom-rpm: Regulator driver for the Qualcomm RPM
        regulator: axp20x: Use parent device as regulator configuration device
        regulator: fan53555: Fix null pointer dereference
        regulator: fan53555: Fixup report wrong vendor message
        regulator: fan53555: fix wrong cast in probe
        regulator: fan53555: add support for Silergy SYR82x regulators
        regulator: fan53555: add devicetree support
        regulator: add devicetree bindings for Fairchild FAN53555 regulators
        regulator: rk808: Add function for ramp delay for buck1/buck2
        regulator: fan53555: use set_ramp_delay to set the ramp up slew rate
        regulator: fan53555: enable vin supply
        regulator: rk808: Fix missing of_node_put
        regulator: rk808: Remove unused variables
        regulator: of: Add stub OF match function for !OF case
        ...
      81e29b7d
    • Linus Torvalds's avatar
      Merge tag 'regmap-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · c831dd73
      Linus Torvalds authored
      Pull regmap updates from Mark Brown:
       "The main update this time around is the addition of a standard DT
        binding for specifying the endianness of devices.  This allows drivers
        to support any endianness of device register map without any code,
        useful for configurable IP blocks.
      
        There's also a few bug fixes that I didn't get round to sending, none
        of them terribly severe or new, and a reduction in size for struct
        regmap"
      
      * tag 'regmap-v3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: Fix debugfs-file 'registers' mode
        regmap: fix possible ZERO_SIZE_PTR pointer dereferencing error.
        regmap: debugfs: fix possbile NULL pointer dereference
        regmap: fix NULL pointer dereference in _regmap_write/read
        regmap: fix NULL pointer dereference in regmap_get_val_endian
        regmap: cache: Do not fail silently from regcache_sync calls
        regmap: change struct regmap's internal locks as union
        regmap: Split regmap_get_endian() in two functions
        regmap: of_regmap_get_endian() cleanup
        regmap: Fix DT endianess parsing logic
        regmap: Add explicit dependencies to catch "select" misuse
        regmap: Restore L: linux-kernel@vger.kernel.org entry
        regmap: Add the DT binding documentation for endianness
        regmap: add DT endianness binding support.
      c831dd73
    • Linus Torvalds's avatar
      Merge tag 'pinctrl-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 2b425a3f
      Linus Torvalds authored
      Pull pin control changes from Linus Walleij:
       "This is the bulk of pin control changes for the v3.18 development
        series:
      
         - New drivers for the Freescale i.MX21, Qualcomm APQ8084 pin
           controllers.
      
         - Incremental new features on the Rockchip, atlas 6, OMAP, AM437x,
           APQ8064, prima2, AT91, Tegra, i.MX, Berlin and Nomadik.
      
         - Push Freescale drivers down into their own subdirectory.
      
         - Assorted sprays of syntax and semantic fixes"
      
      * tag 'pinctrl-v3.18-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (48 commits)
        pinctrl: specify bindings for pins and groups
        pinctrl: nomadik: improve GPIO debug prints
        pinctrl: abx500: refactor DT parser to take two paths
        pinctrl: abx500: use helpers for map allocation/free
        pinctrl: alter device tree bindings for functions
        pinctrl: nomadik: refactor DT parser to take two paths
        pinctrl: nomadik: use utils map free function
        pinctrl: nomadik: use util function to reserve maps
        pinctrl: qcom: use restart_notifier mechanism for ps_hold
        pinctrl: sh-pfc: sh73a0: Remove unnecessary SoC data allocation
        pinctrl: berlin: fix the dt_free_map function
        pinctrl: at91: disable PD or PU before enabling PU or PD
        pinctrl: st: remove gpiochip in failure cases
        pinctrl: at91: Fix error handling while doing gpiochio_irqchip_add
        pinctrl: at91: Fix failure path in at91_gpio_probe path
        pinctrl: lantiq: Release gpiochip resources in fail case
        pinctrl: imx: detect uninitialized pins
        pinctrl: tegra: Add MIPI pad control
        pinctrl: at91: Switch to using managed clk_get
        pinctrl: adi2: Remove duplicate gpiochip_remove_pin_ranges
        ...
      2b425a3f
    • Linus Torvalds's avatar
      Merge tag 'edac_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · c91662cb
      Linus Torvalds authored
      Pull EDAC fixes from Borislav Petkov:
       "Misc small fixes/improvements accumulated from the summer months,
        nothing earth-shattering.
      
        The mpc85xx_edac fix is tagged for stable but since it got confirmed
        only days before the final 3.17 release, I didn't rush a last minute
        pull request to you.  I hope that's ok as it will trickle down to
        stable anyway and we'll make sure it lands in 3.17-stable too"
      
      * tag 'edac_for_3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        mpc85xx_edac: Make L2 interrupt shared too
        amd64_edac: Modify usage of amd64_read_dct_pci_cfg()
        ppc4xx_edac: Fix build error caused by wrong member access
        EDAC: Fix mem_types strings type
      c91662cb
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine · d0cd8481
      Linus Torvalds authored
      Pull dmaengine updates from Dan Williams:
       "Even though this has fixes marked for -stable, given the size and the
        needed conflict resolutions this is 3.18-rc1/merge-window material.
      
        These patches have been languishing in my tree for a long while.  The
        fact that I do not have the time to do proper/prompt maintenance of
        this tree is a primary factor in the decision to step down as
        dmaengine maintainer.  That and the fact that the bulk of drivers/dma/
        activity is going through Vinod these days.
      
        The net_dma removal has not been in -next.  It has developed simple
        conflicts against mainline and net-next (for-3.18).
      
        Continuing thanks to Vinod for staying on top of drivers/dma/.
      
        Summary:
      
         1/ Step down as dmaengine maintainer see commit 08223d80
            "dmaengine maintainer update"
      
         2/ Removal of net_dma, as it has been marked 'broken' since 3.13
            (commit 77873803 "net_dma: mark broken"), without reports of
            performance regression.
      
         3/ Miscellaneous fixes"
      
      * tag 'dmaengine-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/dmaengine:
        net: make tcp_cleanup_rbuf private
        net_dma: revert 'copied_early'
        net_dma: simple removal
        dmaengine maintainer update
        dmatest: prevent memory leakage on error path in thread
        ioat: Use time_before_jiffies()
        dmaengine: fix xor sources continuation
        dma: mv_xor: Rename __mv_xor_slot_cleanup() to mv_xor_slot_cleanup()
        dma: mv_xor: Remove all callers of mv_xor_slot_cleanup()
        dma: mv_xor: Remove unneeded mv_xor_clean_completed_slots() call
        ioat: Use pci_enable_msix_exact() instead of pci_enable_msix()
        drivers: dma: Include appropriate header file in dca.c
        drivers: dma: Mark functions as static in dma_v3.c
        dma: mv_xor: Add DMA API error checks
        ioat/dca: Use dev_is_pci() to check whether it is pci device
      d0cd8481
    • Linus Torvalds's avatar
      Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux · bdf428fe
      Linus Torvalds authored
      Pull module update from Rusty Russell:
       "Nothing major: support for compressing modules, and auto-tainting
        params.
      
        PS. My virtio-next tree is empty: DaveM took the patches I had.  There
            might be a virtio-rng starvation fix, but so far it's a bit voodoo
            so I will get to that in the next two days or it will wait"
      
      * tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
        moduleparam: Resolve missing-field-initializer warning
        kbuild: handle module compression while running 'make modules_install'.
        modinst: wrap long lines in order to enhance cmd_modules_install
        modsign: lookup lines ending in .ko in .mod files
        modpost: simplify file name generation of *.mod.c files
        modpost: reduce visibility of symbols and constify r/o arrays
        param: check for tainting before calling set op.
        drm/i915: taint the kernel if unsafe module parameters are set
        module: add module_param_unsafe and module_param_named_unsafe
        module: make it possible to have unsafe, tainting module params
        module: rename KERNEL_PARAM_FL_NOARG to avoid confusion
      bdf428fe
    • James Bottomley's avatar
    • Linus Torvalds's avatar
      Merge branch 'ipmi' (patches from Corey Minyard) · a40a7201
      Linus Torvalds authored
      Merge ipmi patches from Corey Minyard:
       "These have been in linux-next for a while, ready for 3.18"
      
      * emailed patches from Corey Minyard <minyard@acm.org>:
        ipmi: Clear drvdata when interface is removed
        ipmi: work around gcc-4.9 build warning
        ipmi/of: Don't use unavailable interfaces
        ipmi: Clean up the error handling for channel config errors
      a40a7201
    • Takao Indoh's avatar
      ipmi: Clear drvdata when interface is removed · 567eded9
      Takao Indoh authored
      This patch fixes a bug on hotmod removing.
      
      After ipmi interface is removed using hotmod, kernel panic occurs when
      rmmod impi_si.  For example, try this:
      
       # echo "remove,"`cat /proc/ipmi/0/params` > \
       /sys/module/ipmi_si/parameters/hotmod
       # rmmod ipmi_si
      
      Then, rmmod fails with the following messages.
      
        ------------[ cut here ]------------
        WARNING: CPU: 12 PID: 10819 at /mnt/repos/linux/lib/list_debug.c:53 __list_del_entry+0x63/0xd0()
        CPU: 12 PID: 10819 Comm: rmmod Not tainted 3.17.0-rc1 #19
        Hardware name: FUJITSU-SV PRIMERGY BX920 S2/D3030, BIOS 080015 Rev.3D81.3030 02/10/2012
        Call Trace:
          dump_stack+0x45/0x56
          warn_slowpath_common+0x7d/0xa0
          warn_slowpath_fmt+0x4c/0x50
          __list_del_entry+0x63/0xd0
          list_del+0xd/0x30
          cleanup_one_si+0x2a/0x230 [ipmi_si]
          ipmi_pnp_remove+0x15/0x20 [ipmi_si]
          pnp_device_remove+0x24/0x40
          __device_release_driver+0x7f/0xf0
          driver_detach+0xb0/0xc0
          bus_remove_driver+0x55/0xd0
          driver_unregister+0x2c/0x50
          pnp_unregister_driver+0x12/0x20
          cleanup_ipmi_si+0xbc/0xf0 [ipmi_si]
          SyS_delete_module+0x132/0x1c0
          system_call_fastpath+0x16/0x1b
        ---[ end trace 70b4377268f85c23 ]---
      
      list_del in cleanup_one_si() fails because the smi_info is already
      removed when hotmod removing.
      
      When ipmi interface is removed by hotmod, smi_info is removed by
      cleanup_one_si(), but is is still set in drvdata.  Therefore when rmmod
      ipmi_si, ipmi_pnp_remove tries to remove it again and fails.
      
      By this patch, a pointer to smi_info in drvdata is cleared when hotmod
      removing so that it will be not accessed when rmmod.
      
      changelog:
      v2:
      - Clear drvdata in cleanup_one_si
      - Change subject
      
      v1:
      https://lkml.org/lkml/2014/9/8/741
      
      Signed-off-by: default avatarTakao Indoh <indou.takao@jp.fujitsu.com>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      567eded9
    • Arnd Bergmann's avatar
      ipmi: work around gcc-4.9 build warning · cc4cbe90
      Arnd Bergmann authored
      
      
      Building ipmi on arm with gcc-4.9 results in this warning for an
      allmodconfig build:
      
        drivers/char/ipmi/ipmi_si_intf.c: In function 'ipmi_thread':
        include/linux/time.h:28:5: warning: 'busy_until.tv_sec' may be used uninitialized in this function [-Wmaybe-uninitialized]
          if (lhs->tv_sec > rhs->tv_sec)
             ^
        drivers/char/ipmi/ipmi_si_intf.c:1007:18: note: 'busy_until.tv_sec' was declared here
          struct timespec busy_until;
                          ^
      
      The warning is bogus and this case can not occur.  Apparently this is a
      false positive resulting from gcc getting a little smarter about
      tracking assignments but not smart enough.
      
      Marking the ipmi_thread_busy_wait function as inline gives the gcc
      optimization logic enough information to figure out for itself that the
      case cannot happen, which gets rid of the warning without adding any
      fake initialization.
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      cc4cbe90
    • Benjamin Herrenschmidt's avatar
      ipmi/of: Don't use unavailable interfaces · 08dc4169
      Benjamin Herrenschmidt authored
      
      
      If an IPMI controller is used by the firmware and as such marked with
      a reserved status, we shouldn't use it.
      Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      08dc4169
    • Corey Minyard's avatar
      ipmi: Clean up the error handling for channel config errors · 1f668423
      Corey Minyard authored
      
      
      The code to send the channel config errors was missing an error report
      in one place and needed some more information in another, and had an
      extraneous bit of code.  Clean all that up.
      Signed-off-by: default avatarCorey Minyard <cminyard@mvista.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      1f668423
    • Linus Torvalds's avatar
      Merge tag 'tiny/for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux · 74da3863
      Linus Torvalds authored
      Pull "tinification" patches from Josh Triplett.
      
      Work on making smaller kernels.
      
      * tag 'tiny/for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/josh/linux:
        bloat-o-meter: Ignore syscall aliases SyS_ and compat_SyS_
        mm: Support compiling out madvise and fadvise
        x86: Support compiling out human-friendly processor feature names
        x86: Drop support for /proc files when !CONFIG_PROC_FS
        x86, boot: Don't compile early_serial_console.c when !CONFIG_EARLY_PRINTK
        x86, boot: Don't compile aslr.c when !CONFIG_RANDOMIZE_BASE
        x86, boot: Use the usual -y -n mechanism for objects in vmlinux
        x86: Add "make tinyconfig" to configure the tiniest possible kernel
        x86, platform, kconfig: move kvmconfig functionality to a helper
      74da3863
  3. 06 Oct, 2014 1 commit
  4. 05 Oct, 2014 2 commits
  5. 04 Oct, 2014 5 commits