1. 11 Sep, 2015 3 commits
  2. 03 Sep, 2015 1 commit
  3. 02 Sep, 2015 18 commits
    • Matias Bjørling's avatar
      null_blk: fix wrong capacity when bs is not 512 bytes · 5fdb7e1b
      Matias Bjørling authored
      set_capacity() sets device's capacity using 512 bytes sectors.
      null_blk calculates the number of sectors by size / bs, which
      set_capacity is called with. This led to null_blk exposing the
      wrong number of sectors when bs is not 512 bytes.
      Signed-off-by: default avatarMatias Bjørling <m@bjorling.me>
      Reviewed-by: default avatarRoss Zwisler <ross.zwisler@linux.intel.com>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      5fdb7e1b
    • Matias Bjørling's avatar
      null_blk: fix memory leak on cleanup · de65d2d2
      Matias Bjørling authored
      Driver was not freeing the memory allocated for internal nullb queues.
      This patch frees the memory during driver unload.
      Signed-off-by: default avatarMatias Bjørling <mb@lightnvm.io>
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      de65d2d2
    • Jens Axboe's avatar
      block: fix bogus compiler warnings in blk-merge.c · 5014c311
      Jens Axboe authored
      The compiler can't figure out that bvprv is initialized whenever 'prev'
      is set to 1 as well. Use a pointer to bvprv instead, setting it to NULL
      initially, and get rid of the 'prev' tracking. This dumbs it down
      enough that gcc is happy.
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      5014c311
    • Linus Torvalds's avatar
      Merge branch 'for-4.3/sg' of git://git.kernel.dk/linux-block · d975f309
      Linus Torvalds authored
      Pull SG updates from Jens Axboe:
       "This contains a set of scatter-gather related changes/fixes for 4.3:
      
         - Add support for limited chaining of sg tables even for
           architectures that do not set ARCH_HAS_SG_CHAIN.  From Christoph.
      
         - Add sg chain support to target_rd.  From Christoph.
      
         - Fixup open coded sg->page_link in crypto/omap-sham.  From
           Christoph.
      
         - Fixup open coded crypto ->page_link manipulation.  From Dan.
      
         - Also from Dan, automated fixup of manual sg_unmark_end()
           manipulations.
      
         - Also from Dan, automated fixup of open coded sg_phys()
           implementations.
      
         - From Robert Jarzmik, addition of an sg table splitting helper that
           drivers can use"
      
      * 'for-4.3/sg' of git://git.kernel.dk/linux-block:
        lib: scatterlist: add sg splitting function
        scatterlist: use sg_phys()
        crypto/omap-sham: remove an open coded access to ->page_link
        scatterlist: remove open coded sg_unmark_end instances
        crypto: replace scatterwalk_sg_chain with sg_chain
        target/rd: always chain S/G list
        scatterlist: allow limited chaining without ARCH_HAS_SG_CHAIN
      d975f309
    • Linus Torvalds's avatar
      Merge branch 'for-4.3/drivers' of git://git.kernel.dk/linux-block · 52b084d3
      Linus Torvalds authored
      Pull block driver updates from Jens Axboe:
       "On top of the 4.3 core block IO changes, here are the driver related
        changes for 4.3.  Basically just NVMe and nbd this time around:
      
         - NVMe:
            - PRACT PI improvement from Alok Pandey.
            - Cleanups and improvements on submission queue doorbell and
              writing, using CMB if available.  From Jon Derrick.
            - From Keith, support for setting queue maximum segments, and
              reset support.
            - Also from Jon, fixup of u64 division issue on 32-bit archs and
              wiring up of the reset support through and ioctl.
            - Two small cleanups from Matias and Sunad
      
        - Various code cleanups and fixes from Markus Pargmann"
      
      * 'for-4.3/drivers' of git://git.kernel.dk/linux-block:
        NVMe: Using PRACT bit to generate and verify PI by controller
        NVMe:Remove unreachable code in nvme_abort_req
        NVMe: Add nvme subsystem reset IOCTL
        NVMe: Add nvme subsystem reset support
        NVMe: removed unused nn var from nvme_dev_add
        NVMe: Set queue max segments
        nbd: flags is a u32 variable
        nbd: Rename functions for clearness of recv/send path
        nbd: Change 'disconnect' to be boolean
        nbd: Add debugfs entries
        nbd: Remove variable 'pid'
        nbd: Move clear queue debug message
        nbd: Remove 'harderror' and propagate error properly
        nbd: restructure sock_shutdown
        nbd: sock_shutdown, remove conditional lock
        nbd: Fix timeout detection
        nvme: Fixes u64 division which breaks i386 builds
        NVMe: Use CMB for the IO SQes if available
        NVMe: Unify SQ entry writing and doorbell ringing
      52b084d3
    • Linus Torvalds's avatar
      Merge branch 'for-4.3/core' of git://git.kernel.dk/linux-block · 1081230b
      Linus Torvalds authored
      Pull core block updates from Jens Axboe:
       "This first core part of the block IO changes contains:
      
         - Cleanup of the bio IO error signaling from Christoph.  We used to
           rely on the uptodate bit and passing around of an error, now we
           store the error in the bio itself.
      
         - Improvement of the above from myself, by shrinking the bio size
           down again to fit in two cachelines on x86-64.
      
         - Revert of the max_hw_sectors cap removal from a revision again,
           from Jeff Moyer.  This caused performance regressions in various
           tests.  Reinstate the limit, bump it to a more reasonable size
           instead.
      
         - Make /sys/block/<dev>/queue/discard_max_bytes writeable, by me.
           Most devices have huge trim limits, which can cause nasty latencies
           when deleting files.  Enable the admin to configure the size down.
           We will look into having a more sane default instead of UINT_MAX
           sectors.
      
         - Improvement of the SGP gaps logic from Keith Busch.
      
         - Enable the block core to handle arbitrarily sized bios, which
           enables a nice simplification of bio_add_page() (which is an IO hot
           path).  From Kent.
      
         - Improvements to the partition io stats accounting, making it
           faster.  From Ming Lei.
      
         - Also from Ming Lei, a basic fixup for overflow of the sysfs pending
           file in blk-mq, as well as a fix for a blk-mq timeout race
           condition.
      
         - Ming Lin has been carrying Kents above mentioned patches forward
           for a while, and testing them.  Ming also did a few fixes around
           that.
      
         - Sasha Levin found and fixed a use-after-free problem introduced by
           the bio->bi_error changes from Christoph.
      
         - Small blk cgroup cleanup from Viresh Kumar"
      
      * 'for-4.3/core' of git://git.kernel.dk/linux-block: (26 commits)
        blk: Fix bio_io_vec index when checking bvec gaps
        block: Replace SG_GAPS with new queue limits mask
        block: bump BLK_DEF_MAX_SECTORS to 2560
        Revert "block: remove artifical max_hw_sectors cap"
        blk-mq: fix race between timeout and freeing request
        blk-mq: fix buffer overflow when reading sysfs file of 'pending'
        Documentation: update notes in biovecs about arbitrarily sized bios
        block: remove bio_get_nr_vecs()
        fs: use helper bio_add_page() instead of open coding on bi_io_vec
        block: kill merge_bvec_fn() completely
        md/raid5: get rid of bio_fits_rdev()
        md/raid5: split bio for chunk_aligned_read
        block: remove split code in blkdev_issue_{discard,write_same}
        btrfs: remove bio splitting and merge_bvec_fn() calls
        bcache: remove driver private bio splitting code
        block: simplify bio_add_page()
        block: make generic_make_request handle arbitrarily sized bios
        blk-cgroup: Drop unlikely before IS_ERR(_OR_NULL)
        block: don't access bio->bi_error after bio_put()
        block: shrink struct bio down to 2 cache lines again
        ...
      1081230b
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · df910390
      Linus Torvalds authored
      Pull first round of SCSI updates from James Bottomley:
       "This includes one new driver: cxlflash plus the usual grab bag of
        updates for the major drivers: qla2xxx, ipr, storvsc, pm80xx, hptiop,
        plus a few assorted fixes.
      
        There's another tranch coming, but I want to incubate it another few
        days in the checkers, plus it includes a mpt2sas separated lifetime
        fix, which Avago won't get done testing until Friday"
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (85 commits)
        aic94xx: set an error code on failure
        storvsc: Set the error code correctly in failure conditions
        storvsc: Allow write_same when host is windows 10
        storvsc: use storage protocol version to determine storage capabilities
        storvsc: use correct defaults for values determined by protocol negotiation
        storvsc: Untangle the storage protocol negotiation from the vmbus protocol negotiation.
        storvsc: Use a single value to track protocol versions
        storvsc: Rather than look for sets of specific protocol versions, make decisions based on ranges.
        cxlflash: Remove unused variable from queuecommand
        cxlflash: shift wrapping bug in afu_link_reset()
        cxlflash: off by one bug in cxlflash_show_port_status()
        cxlflash: Virtual LUN support
        cxlflash: Superpipe support
        cxlflash: Base error recovery support
        qla2xxx: Update driver version to 8.07.00.26-k
        qla2xxx: Add pci device id 0x2261.
        qla2xxx: Fix missing device login retries.
        qla2xxx: do not clear slot in outstanding cmd array
        qla2xxx: Remove decrement of sp reference count in abort handler.
        qla2xxx: Add support to show MPI and PEP FW version for ISP27xx.
        ...
      df910390
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20150901' of git://git.infradead.org/linux-mtd · 91a247d7
      Linus Torvalds authored
      Pull MTD updates from Brian Norris:
       "SPI NOR:
         - reduce virtual address space requirements for fsl-quadspi memory map
         - new fsl-quadspi IP support: imx6ul-qspi and imx7d-qspi
         - add new NOR flash device support
         - add new driver for NXP SPI Flash Interface (SPIFI)
         - stop abusing SPI API structs for non-SPI framework
         - fixup DT table matching for new "jedec,spi-nor" string
      
        NAND:
         - brcmnand: fix big endian MIPS macro usage
         - denali: refactor to use devres, dev_*() printing, etc.
         - OMAP ELM: change the module alias to actually be usable
         - pxa3xx_nand: fixup a few command sequencing issues -- both new and old
            - race conditions in the IRQ handler status clearing
            - problems when a bootloader left interrupts pending
            - config issues when overriding the bootloader configuration
         - new flash device support
         - sunxi_nand:
            - optimize timing configuration by calculation, rather than fixed
              fail-safe values
            - use EDO setting from ONFI
         - r852: fix compiler warnings
         - davinci: add 4KB page support
      
        Core:
         - oobtest: correct debug print information"
      
      * tag 'for-linus-20150901' of git://git.infradead.org/linux-mtd: (42 commits)
        mtd: mtd_oobtest: Fix the address offset with vary_offset case
        mtd: blkdevs: fix switch-bool compilation warning
        mtd: spi-nor: stop (ab)using struct spi_device_id
        mtd: nand: add Toshiba TC58NVG0S3E to nand_ids table
        mtd: dataflash: Export OF module alias information
        nand: pxa3xx: Increase READ_ID buffer and make the size static
        mtd: nand: pxa3xx-nand: fix random command timeouts
        mtd: nand: pxa3xx_nand: fix early spurious interrupt
        mtd: pxa3xx_nand: add a default chunk size
        mtd: omap_elm: Fix module alias
        mtd: physmap_of: fix null pointer deference when kzalloc returns null
        mtd: nettel: do not ignore mtd_device_register() failure in nettel_init()
        mtd: denali_pci: switch to dev_err()
        mtd: denali_pci: refactor driver using devres API
        mtd: denali_pci: use module_pci_driver() macro
        mtd: denali: hide core part from user in Kconfig
        mtd: spi-nor: add Spansion S25FL204K support
        mtd: spi-nor: Improve Kconfig help text for SPI_FSL_QUADSPI
        mtd: spi-nor: add driver for NXP SPI Flash Interface (SPIFI)
        doc: dt: add documentation for nxp,lpc1773-spifi
        ...
      91a247d7
    • Linus Torvalds's avatar
      Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 8bdc69b7
      Linus Torvalds authored
      Pull cgroup updates from Tejun Heo:
      
       - a new PIDs controller is added.  It turns out that PIDs are actually
         an independent resource from kmem due to the limited PID space.
      
       - more core preparations for the v2 interface.  Once cpu side interface
         is settled, it should be ready for lifting the devel mask.
         for-4.3-unified-base was temporarily branched so that other trees
         (block) can pull cgroup core changes that blkcg changes depend on.
      
       - a non-critical idr_preload usage bug fix.
      
      * 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: pids: fix invalid get/put usage
        cgroup: introduce cgroup_subsys->legacy_name
        cgroup: don't print subsystems for the default hierarchy
        cgroup: make cftype->private a unsigned long
        cgroup: export cgrp_dfl_root
        cgroup: define controller file conventions
        cgroup: fix idr_preload usage
        cgroup: add documentation for the PIDs controller
        cgroup: implement the PIDs subsystem
        cgroup: allow a cgroup subsystem to reject a fork
      8bdc69b7
    • Linus Torvalds's avatar
      Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 76ec51ef
      Linus Torvalds authored
      Pull percpu updates from Tejun Heo:
       "Minor cleanups"
      
      * 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: clean up of schunk->map[] assignment in pcpu_setup_first_chunk
        percpu: update incorrect comment for this_cpu_*() operations
      76ec51ef
    • Linus Torvalds's avatar
      Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 7d3e2eb1
      Linus Torvalds authored
      Pull workqueue updates from Tejun Heo:
       "Only three trivial changes for workqueue this time - doc, MAINTAINERS
        and EXPORT_SYMBOL updates"
      
      * 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: fix some docbook warnings
        workqueue: Make flush_workqueue() available again to non GPL modules
        workqueue: add myself as a dedicated reviwer
      7d3e2eb1
    • Linus Torvalds's avatar
      Merge branch 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 2dc7e555
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
       "Nothing interesting.  A couple device specific minor updates and a
        kernel doc change"
      
      * 'for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ata: pata_arasam_cf: Use devm_clk_get
        libata: fix libata-core.c kernel-doc warning
        ata: sata_rcar: Remove obsolete sata-r8a779* platform_device_id entries
      2dc7e555
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · ae982073
      Linus Torvalds authored
      Pull power management and ACPI updates from Rafael Wysocki:
       "From the number of commits perspective, the biggest items are ACPICA
        and cpufreq changes with the latter taking the lead (over 50 commits).
      
        On the cpufreq front, there are many cleanups and minor fixes in the
        core and governors, driver updates etc.  We also have a new cpufreq
        driver for Mediatek MT8173 chips.
      
        ACPICA mostly updates its debug infrastructure and adds a number of
        fixes and cleanups for a good measure.
      
        The Operating Performance Points (OPP) framework is updated with new
        DT bindings and support for them among other things.
      
        We have a few updates of the generic power domains framework and a
        reorganization of the ACPI device enumeration code and bus type
        operations.
      
        And a lot of fixes and cleanups all over.
      
        Included is one branch from the MFD tree as it contains some
        PM-related driver core and ACPI PM changes a few other commits are
        based on.
      
        Specifics:
      
         - ACPICA update to upstream revision 20150818 including method
           tracing extensions to allow more in-depth AML debugging in the
           kernel and a number of assorted fixes and cleanups (Bob Moore, Lv
           Zheng, Markus Elfring).
      
         - ACPI sysfs code updates and a documentation update related to AML
           method tracing (Lv Zheng).
      
         - ACPI EC driver fix related to serialized evaluations of _Qxx
           methods and ACPI tools updates allowing the EC userspace tool to be
           built from the kernel source (Lv Zheng).
      
         - ACPI processor driver updates preparing it for future introduction
           of CPPC support and ACPI PCC mailbox driver updates (Ashwin
           Chaugule).
      
         - ACPI interrupts enumeration fix for a regression related to the
           handling of IRQ attribute conflicts between MADT and the ACPI
           namespace (Jiang Liu).
      
         - Fixes related to ACPI device PM (Mika Westerberg, Srinidhi
           Kasagar).
      
         - ACPI device registration code reorganization to separate the
           sysfs-related code and bus type operations from the rest (Rafael J
           Wysocki).
      
         - Assorted cleanups in the ACPI core (Jarkko Nikula, Mathias Krause,
           Andy Shevchenko, Rafael J Wysocki, Nicolas Iooss).
      
         - ACPI cpufreq driver and ia64 cpufreq driver fixes and cleanups (Pan
           Xinhui, Rafael J Wysocki).
      
         - cpufreq core cleanups on top of the previous changes allowing it to
           preseve its sysfs directories over system suspend/resume (Viresh
           Kumar, Rafael J Wysocki, Sebastian Andrzej Siewior).
      
         - cpufreq fixes and cleanups related to governors (Viresh Kumar).
      
         - cpufreq updates (core and the cpufreq-dt driver) related to the
           turbo/boost mode support (Viresh Kumar, Bartlomiej Zolnierkiewicz).
      
         - New DT bindings for Operating Performance Points (OPP), support for
           them in the OPP framework and in the cpufreq-dt driver plus related
           OPP framework fixes and cleanups (Viresh Kumar).
      
         - cpufreq powernv driver updates (Shilpasri G Bhat).
      
         - New cpufreq driver for Mediatek MT8173 (Pi-Cheng Chen).
      
         - Assorted cpufreq driver (speedstep-lib, sfi, integrator) cleanups
           and fixes (Abhilash Jindal, Andrzej Hajda, Cristian Ardelean).
      
         - intel_pstate driver updates including Skylake-S support, support
           for enabling HW P-states per CPU and an additional vendor bypass
           list entry (Kristen Carlson Accardi, Chen Yu, Ethan Zhao).
      
         - cpuidle core fixes related to the handling of coupled idle states
           (Xunlei Pang).
      
         - intel_idle driver updates including Skylake Client support and
           support for freeze-mode-specific idle states (Len Brown).
      
         - Driver core updates related to power management (Andy Shevchenko,
           Rafael J Wysocki).
      
         - Generic power domains framework fixes and cleanups (Jon Hunter,
           Geert Uytterhoeven, Rajendra Nayak, Ulf Hansson).
      
         - Device PM QoS framework update to allow the latency tolerance
           setting to be exposed to user space via sysfs (Mika Westerberg).
      
         - devfreq support for PPMUv2 in Exynos5433 and a fix for an incorrect
           exynos-ppmu DT binding (Chanwoo Choi, Javier Martinez Canillas).
      
         - System sleep support updates (Alan Stern, Len Brown, SungEun Kim).
      
         - rockchip-io AVS support updates (Heiko Stuebner).
      
         - PM core clocks support fixup (Colin Ian King).
      
         - Power capping RAPL driver update including support for Skylake H/S
           and Broadwell-H (Radivoje Jovanovic, Seiichi Ikarashi).
      
         - Generic device properties framework fixes related to the handling
           of static (driver-provided) property sets (Andy Shevchenko).
      
         - turbostat and cpupower updates (Len Brown, Shilpasri G Bhat,
           Shreyas B Prabhu)"
      
      * tag 'pm+acpi-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (180 commits)
        cpufreq: speedstep-lib: Use monotonic clock
        cpufreq: powernv: Increase the verbosity of OCC console messages
        cpufreq: sfi: use kmemdup rather than duplicating its implementation
        cpufreq: drop !cpufreq_driver check from cpufreq_parse_governor()
        cpufreq: rename cpufreq_real_policy as cpufreq_user_policy
        cpufreq: remove redundant 'policy' field from user_policy
        cpufreq: remove redundant 'governor' field from user_policy
        cpufreq: update user_policy.* on success
        cpufreq: use memcpy() to copy policy
        cpufreq: remove redundant CPUFREQ_INCOMPATIBLE notifier event
        cpufreq: mediatek: Add MT8173 cpufreq driver
        dt-bindings: mediatek: Add MT8173 CPU DVFS clock bindings
        PM / Domains: Fix typo in description of genpd_dev_pm_detach()
        PM / Domains: Remove unusable governor dummies
        PM / Domains: Make pm_genpd_init() available to modules
        PM / domains: Align column headers and data in pm_genpd_summary output
        powercap / RAPL: disable the 2nd power limit properly
        tools: cpupower: Fix error when running cpupower monitor
        PM / OPP: Drop unlikely before IS_ERR(_OR_NULL)
        PM / OPP: Fix static checker warning (broken 64bit big endian systems)
        ...
      ae982073
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux · f1a3c0b9
      Linus Torvalds authored
      Pull devicetree updates from Rob Herring:
       - added Frank Rowand as DT maintainer in preparation for Grant's
         retirement.
       - generic MSI binding documentation and a few other minor doc updates
       - fix long standing issue with DT platorm device unregistration
       - fix loop forever bug in of_find_matching_node_by_address()
      
      * tag 'devicetree-for-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
        MAINTAINERS: Add Frank Rowand as DT maintainer
        mtd: nand: pxa3xx: add optional dma for pxa architecture
        Documentation: DT: cpsw: document missing compatible
        Docs: dt: add generic MSI bindings
        drivercore: Fix unregistration path of platform devices
        of/address: Don't loop forever in of_find_matching_node_by_address().
        of: Add vendor prefix for JEDEC Solid State Technology Association
        of/platform: add function to populate default bus
        of: Add vendor prefix for Sharp Corporation
      f1a3c0b9
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 089b6695
      Linus Torvalds authored
      Pull trivial tree updates from Jiri Kosina:
       "The usual stuff from trivial tree for 4.3 (kerneldoc updates, printk()
        fixes, Documentation and MAINTAINERS updates)"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (28 commits)
        MAINTAINERS: update my e-mail address
        mod_devicetable: add space before */
        scsi: a100u2w: trivial typo in printk
        i2c: Fix typo in i2c-bfin-twi.c
        treewide: fix typos in comment blocks
        Doc: fix trivial typo in SubmittingPatches
        proportions: Spelling s/consitent/consistent/
        dm: Spelling s/consitent/consistent/
        aic7xxx: Fix typo in error message
        pcmcia: Fix typo in locking documentation
        scsi/arcmsr: Fix typos in error log
        drm/nouveau/gr: Fix typo in nv10.c
        [SCSI] Fix printk typos in drivers/scsi
        staging: comedi: Grammar s/Enable support a/Enable support for a/
        Btrfs: Spelling s/consitent/consistent/
        README: GTK+ is a acronym
        ASoC: omap: Fix typo in config option description
        mm: tlb.c: Fix error message
        ntfs: super.c: Fix error log
        fix typo in Documentation/SubmittingPatches
        ...
      089b6695
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 45c680b9
      Linus Torvalds authored
      Pull livepatching fix from Jiri Kosina:
       "Livepatching error handling fix"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: Improve error handling in klp_disable_func()
      45c680b9
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 851328fe
      Linus Torvalds authored
      Pull HID updates from Jiri Kosina:
       "to receive patches queued for 4.3 merge window in HID tree. Highlights:
      
         - a lot of improvements (regarding supported features and devices) to
           Wacom driver, from Aaron Skomra and Jason Gerecke
         - a lot of functional fixes and support for large I2C transfer to
           cp2112 driver, from Ellen Wang
         - HW support improvements to RMI driver, from Andrew Duggan
         - quite some small fixes and device ID additions all over the place"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid: (44 commits)
        HID: wacom: wacom_setup_numbered_buttons is local to wacom_wac
        HID: wacom: Add support for Express Key Remote.
        HID: wacom: Set button bits based on a new numbered_buttons
        HID: quirks: add QUIRK_NOGET for an other TPV touchscreen
        HID: usbhid: Fix the check for HID_RESET_PENDING in hid_io_error
        HID: i2c-hid: Only disable irq wake if it was successfully enabled during suspend
        HID: wacom: Use tablet-provided touch height/width values for INTUOSHT
        HID: gembird: add new driver to fix Gembird JPD-DualForce 2
        HID: lenovo: Hide middle-button press until release
        HID: lenovo: Add missing return-value check
        HID: lenovo: Use constants for axes names
        HID: wacom: Simplify 'wacom_pl_irq'
        HID: wacom: Do not repeatedly attempt to set device mode on error
        HID: wacom: Do not repeatedly attempt to set device mode on error
        HID: wacom: Remove WACOM_QUIRK_NO_INPUT
        HID: wacom: Replace WACOM_QUIRK_MONITOR with WACOM_DEVICETYPE_WL_MONITOR
        HID: wacom: Use calculated pkglen for wireless touch interface
        HID: sony: Fix DS4 controller reporting rate issues
        HID: chicony: Add support for Acer Aspire Switch 12
        HID: hid-lg: Add USBID for Logitech G29 Wheel
        ...
      851328fe
    • Linus Torvalds's avatar
      Merge tag 'edac_for_4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 2d678b68
      Linus Torvalds authored
      Pull EDAC fixes from Borislav Petkov:
       "Two minor fixlets this time: AMD MCE decoding correction and
        xgene_edac cleanup"
      
      * tag 'edac_for_4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        EDAC, mce_amd: Don't emit 'CE' for Deferred error
        EDAC, xgene: Drop owner assignment from platform_driver
      2d678b68
  4. 01 Sep, 2015 18 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace · 73b6fa8e
      Linus Torvalds authored
      Pull user namespace updates from Eric Biederman:
       "This finishes up the changes to ensure proc and sysfs do not start
        implementing executable files, as the there are application today that
        are only secure because such files do not exist.
      
        It akso fixes a long standing misfeature of /proc/<pid>/mountinfo that
        did not show the proper source for files bind mounted from
        /proc/<pid>/ns/*.
      
        It also straightens out the handling of clone flags related to user
        namespaces, fixing an unnecessary failure of unshare(CLONE_NEWUSER)
        when files such as /proc/<pid>/environ are read while <pid> is calling
        unshare.  This winds up fixing a minor bug in unshare flag handling
        that dates back to the first version of unshare in the kernel.
      
        Finally, this fixes a minor regression caused by the introduction of
        sysfs_create_mount_point, which broke someone's in house application,
        by restoring the size of /sys/fs/cgroup to 0 bytes.  Apparently that
        application uses the directory size to determine if a tmpfs is mounted
        on /sys/fs/cgroup.
      
        The bind mount escape fixes are present in Al Viros for-next branch.
        and I expect them to come from there.  The bind mount escape is the
        last of the user namespace related security bugs that I am aware of"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        fs: Set the size of empty dirs to 0.
        userns,pidns: Force thread group sharing, not signal handler sharing.
        unshare: Unsharing a thread does not require unsharing a vm
        nsfs: Add a show_path method to fix mountinfo
        mnt: fs_fully_visible enforce noexec and nosuid  if !SB_I_NOEXEC
        vfs: Commit to never having exectuables on proc and sysfs.
      73b6fa8e
    • Linus Torvalds's avatar
      Merge branch 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · e713c80a
      Linus Torvalds authored
      Pull x86 clockevent update from Thomas Gleixner:
       "A single commit, which converts HPET clockevents driver to the new
        callbacks"
      
      * 'x86-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/hpet: Migrate to new set_state interface
      e713c80a
    • Linus Torvalds's avatar
      Merge branch 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 43af9872
      Linus Torvalds authored
      Pull x86 apic updates from Thomas Gleixner:
       "This udpate contains:
      
         - rework the irq vector array to store a pointer to the irq
           descriptor instead of the irq number to avoid a lookup of the irq
           descriptor in the irq entry path
      
         - lguest interrupt handling cleanups
      
         - conversion of the local apic timer to the new clockevent callbacks
      
         - preparatory changes for the irq argument removal of interrupt flow
           handlers"
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/irq: Do not dereference irq descriptor before checking it
        tools/lguest: Clean up include dir
        tools/lguest: Fix redefinition of struct virtio_pci_cfg_cap
        x86/irq: Store irq descriptor in vector array
        genirq: Provide irq_desc_has_action
        x86/irq: Get rid of an indentation level
        x86/irq: Rename VECTOR_UNDEFINED to VECTOR_UNUSED
        x86/irq: Replace numeric constant
        x86/irq: Protect smp_cleanup_move
        x86/lguest: Do not setup unused irq vectors
        x86/lguest: Clean up lguest_setup_irq
        x86/apic: Drop local_irq_save/restore in timer callbacks
        x86/apic: Migrate apic timer to new set_state interface
        x86/irq: Use access helper irq_data_get_affinity_mask()
        x86/irq: Use accessor irq_data_get_irq_handler_data()
        x86/irq: Use accessor irq_data_get_node()
      43af9872
    • Linus Torvalds's avatar
      Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 17e6b00a
      Linus Torvalds authored
      Pull irq updates from Thomas Gleixner:
       "This updated pull request does not contain the last few GIC related
        patches which were reported to cause a regression.  There is a fix
        available, but I let it breed for a couple of days first.
      
        The irq departement provides:
      
         - new infrastructure to support non PCI based MSI interrupts
         - a couple of new irq chip drivers
         - the usual pile of fixlets and updates to irq chip drivers
         - preparatory changes for removal of the irq argument from interrupt
           flow handlers
         - preparatory changes to remove IRQF_VALID"
      
      * 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (129 commits)
        irqchip/imx-gpcv2: IMX GPCv2 driver for wakeup sources
        irqchip: Add bcm2836 interrupt controller for Raspberry Pi 2
        irqchip: Add documentation for the bcm2836 interrupt controller
        irqchip/bcm2835: Add support for being used as a second level controller
        irqchip/bcm2835: Refactor handle_IRQ() calls out of MAKE_HWIRQ
        PCI: xilinx: Fix typo in function name
        irqchip/gic: Ensure gic_cpu_if_up/down() programs correct GIC instance
        irqchip/gic: Only allow the primary GIC to set the CPU map
        PCI/MSI: pci-xgene-msi: Consolidate chained IRQ handler install/remove
        unicore32/irq: Prepare puv3_gpio_handler for irq argument removal
        tile/pci_gx: Prepare trio_handle_level_irq for irq argument removal
        m68k/irq: Prepare irq handlers for irq argument removal
        C6X/megamode-pic: Prepare megamod_irq_cascade for irq argument removal
        blackfin: Prepare irq handlers for irq argument removal
        arc/irq: Prepare idu_cascade_isr for irq argument removal
        sparc/irq: Use access helper irq_data_get_affinity_mask()
        sparc/irq: Use helper irq_data_get_irq_handler_data()
        parisc/irq: Use access helper irq_data_get_affinity_mask()
        mn10300/irq: Use access helper irq_data_get_affinity_mask()
        irqchip/i8259: Prepare i8259_irq_dispatch for irq argument removal
        ...
      17e6b00a
    • Linus Torvalds's avatar
      Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5e359bf2
      Linus Torvalds authored
      Pull timer updates from Thomas Gleixner:
       "Rather large, but nothing exiting:
      
         - new range check for settimeofday() to prevent that boot time
           becomes negative.
         - fix for file time rounding
         - a few simplifications of the hrtimer code
         - fix for the proc/timerlist code so the output of clock realtime
           timers is accurate
         - more y2038 work
         - tree wide conversion of clockevent drivers to the new callbacks"
      
      * 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (88 commits)
        hrtimer: Handle failure of tick_init_highres() gracefully
        hrtimer: Unconfuse switch_hrtimer_base() a bit
        hrtimer: Simplify get_target_base() by returning current base
        hrtimer: Drop return code of hrtimer_switch_to_hres()
        time: Introduce timespec64_to_jiffies()/jiffies_to_timespec64()
        time: Introduce current_kernel_time64()
        time: Introduce struct itimerspec64
        time: Add the common weak version of update_persistent_clock()
        time: Always make sure wall_to_monotonic isn't positive
        time: Fix nanosecond file time rounding in timespec_trunc()
        timer_list: Add the base offset so remaining nsecs are accurate for non monotonic timers
        cris/time: Migrate to new 'set-state' interface
        kernel: broadcast-hrtimer: Migrate to new 'set-state' interface
        xtensa/time: Migrate to new 'set-state' interface
        unicore/time: Migrate to new 'set-state' interface
        um/time: Migrate to new 'set-state' interface
        sparc/time: Migrate to new 'set-state' interface
        sh/localtimer: Migrate to new 'set-state' interface
        score/time: Migrate to new 'set-state' interface
        s390/time: Migrate to new 'set-state' interface
        ...
      5e359bf2
    • Linus Torvalds's avatar
      Merge tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 8d01b66b
      Linus Torvalds authored
      Pull ARM SoC 64-bit changes from Olof Johansson:
       "Here's our branch of ARM64 contents for this merge window.
      
        Most of this is DT contents for new SoCs (or those who have seen new
        device support added).  Maybe we should stop separating out the arm64
        contents here to avoid the kind of internal conflicts as we got this
        time around, where 32- and 64-bit contents conflicted.
      
        Anyhow, on the actual contents:
      
        New SoCs:
      
         - Broadcom North Star 2 (ns2)
         - Marvell Berlin4CT
         - Mediatek MT6795
         - Rockchip RK3368
      
        In addition, there are enhancements for the following platforms:
      
         - Mediatek MT8173: cpuidle-dt updates, misc other additions
         - ZyncMP: A bunch of devices added to the existing DTSI
         - Qualcomm MSM8916 and APQ8016 updates for USB, etc.
      
        + a handful of other updates for various platforms"
      
      * tag 'armsoc-arm64' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (47 commits)
        ARM64: dts: vexpress: Use assigned-clock-parents for sp810
        ARM64: dts: mt6795: enable basic SMP bringup for MT6795
        arm64: Enable Marvell Berlin SoC family in defconfig
        arm64: Enable Marvell Berlin SoC family in Kconfig
        arm64: dts: Add dts files for Marvell Berlin4CT SoC
        ARM64: zynqmp: Move SPI nodes to the right location
        ARM64: zynqmp: Move uart and ttcs to the right location
        ARM64: zynqmp: Enable spi flashes on ep108
        ARM64: zynqmp: Add eeprom memories on i2c bus
        ARM64: zynqmp: Enable sdhci on ep108
        ARM64: zynqmp: Enable watchdog on ep108
        ARM64: zynqmp: Add DWC3 usb support
        ARM64: zynqmp: Add SMMU support
        ARM64: zynqmp: Add CANs node for platform
        ARM64: zynqmp: Use zynqmp specific compatible string for gpio
        devicetree: xilinx: zynqmp: add sata node
        PCI: iproc: Fix BCMA dependency in Kconfig
        arm64: dts: Add Broadcom North Star 2 support
        arm64: Add Broadcom iProc family support
        PCI: iproc: Fix ARM64 dependency in Kconfig
        ...
      8d01b66b
    • Linus Torvalds's avatar
      Merge tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 2faf962d
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Olof Johansson:
       "We mostly keep defconfigs updates on a separate branch due to their
        tendency to conflict between platforms and this encourages more
        careful separation of code changes and config changes.
      
        Most updates here are minor tweaks, enabling new drivers for various
        platforms, and so on.  Renesas also removed one defconfig
        (marzen_defconfig)"
      
      * tag 'armsoc-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (44 commits)
        ARM: add TC2 PM support to multi_v7_defconfig
        ARM: tegra: Update multi_v7_defconfig
        ARM: tegra: Update default configuration
        ARM: at91/defconfig: at91_dt: remove ARM_AT91_ETHER
        ARM: at91/defconfig: at91_dt: enable DRM hlcdc support
        ARM: at91: at91_dt_defconfig: enable ISI and ov2640 support
        ARM: multi_v7_defconfig: Enable Allwinner P2WI, PWM, DMA_SUN6I, cryptodev
        ARM: sunxi_defconfig: Enable DMA_SUN6I, P2WI, PWM, cryptodev, EXTCON, FHANDLE
        ARM: shmobile: Enable fixed voltage regulator in shmobile_defconfig
        ARM: multi_v7_defconfig: Select MX6UL and MX7D
        ARM: prima2_defconfig: enable build for hwspinlock
        ARM: prima2_defconfig: enable build for RTC
        ARM: prima2_defconfig: enable build for misc input
        ARM: prima2_defconfig: enable build for SiRFSoC SDHC host
        ARM: prima2_defconfig: fix the outdated defconfig
        ARM: imx_v6_v7_defconfig: Select CONFIG_IKCONFIG_PROC
        ARM: defconfig: orion5x: add DT support
        ARM: qcom_defconfig: Enable options for KS8851 ethernet
        ARM: multi_v7_defconfig: Enable support for PWM Regulators
        ARM: multi_v7_defconfig: Enable ST's PWM driver
        ...
      2faf962d
    • Linus Torvalds's avatar
      Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · b3a5af43
      Linus Torvalds authored
      Pull ARM DT updates from Olof Johansson:
       "Ladies and gentlemen, we proudly announce to you the latest branch of
        ARM device tree contents for the mainline kernel.  Come and see, come
        and see!
      
        No less than twentythree thousand lines of additions! Just imagine the
        joy you will have of using your mainline kernel on newly supported
        hardware such as Rockchip Chromebooks, Freescale i.MX6UL boards or
        UniPhier hardware!
      
        For those of you feeling less adventurous, added hardware support on
        platforms such as TI DM814x and Gumstix Overo platforms might be more
        of your liking.
      
        We've got something for everyone here!
      
        Ahem.  Cough.  So, anyway...
      
        This is the usual large batch of DT updates.  Lots and lots of smaller
        changes, some of the larger ones to point out are:
      
         - Rockchip veyron (Chromebook) support, as well as several other new boards
         - DRM support on Atmel AT91SAM9N12EK
         - USB additions on some Allwinner platforms
         - Mediatek MT6580 support
         - Freescale i.MX6UL support
         - cleanups for Renesas shmobile platforms
         - lots of added devices on LPC18xx
         - lots of added devices and boards on UniPhier
      
        There's also some dependent code added here, in particular some
        branches that are primarily merged through the clock tree"
      
      * tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (389 commits)
        ARM: tegra: Add gpio-ranges property
        ARM: tegra: Fix AHB base address on Tegra20, Tegra30 and Tegra114
        ARM: tegra: Add Tegra124 PMU support
        ARM: tegra: jetson-tk1: Add GK20A GPU DT node
        ARM: tegra: venice2: Add GK20A GPU DT node
        ARM: tegra: Add IOMMU node to GK20A
        ARM: tegra: Add CPU regulator to the Jetson TK1 device tree
        ARM: tegra: Add entries for cpufreq on Tegra124
        ARM: tegra: Enable the DFLL on the Jetson TK1
        ARM: tegra: Add the DFLL to Tegra124 device tree
        ARM: dts: zynq: Add devicetree entry for Xilinx Zynq reset controller.
        ARM: dts: UniPhier: fix PPI interrupt CPU mask of timer nodes
        ARM: dts: rockchip: correct regulator power states for suspend
        ARM: dts: rockchip: correct regulator PM properties
        ARM: dts: vexpress: Use assigned-clock-parents for sp810
        pinctrl: tegra: Only set the gpio range if needed
        arm: boot: dts: am4372: add ARM timers and SCU nodes
        ARM: dts: AM4372: Add the am4372-rtc compatible string
        ARM: shmobile: r8a7794 dtsi: Add CPG/MSTP Clock Domain
        ARM: shmobile: r8a7793 dtsi: Add CPG/MSTP Clock Domain
        ...
      b3a5af43
    • Linus Torvalds's avatar
      Merge tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 10217810
      Linus Torvalds authored
      Pull ARM SoC driver updates from Olof Johansson:
       "Some releases this branch is nearly empty, others we have more stuff.
        It tends to gather drivers that need SoC modification or dependencies
        such that they have to (also) go in through our tree.
      
        For this release, we have merged in part of the reset controller tree
        (with handshake that the parts we have merged in will remain stable),
        as well as dependencies on a few clock branches.
      
        In general, new items here are:
      
         - Qualcomm driver for SMM/SMD, which is how they communicate with the
           coprocessors on (some) of their platforms
      
         - memory controller work for ARM's PL172 memory controller
      
         - reset drivers for various platforms
      
         - PMU power domain support for Marvell platforms
      
         - Tegra support for T132/T210 SoCs: PMC, fuse, memory controller
           per-SoC support"
      
      * tag 'armsoc-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (49 commits)
        ARM: tegra: cpuidle: implement cpuidle_state.enter_freeze()
        ARM: tegra: Disable cpuidle if PSCI is available
        soc/tegra: pmc: Use existing pclk reference
        soc/tegra: pmc: Remove unnecessary return statement
        soc: tegra: Remove redundant $(CONFIG_ARCH_TEGRA) in Makefile
        memory: tegra: Add Tegra210 support
        memory: tegra: Add support for a variable-size client ID bitfield
        clk: shmobile: rz: Add CPG/MSTP Clock Domain support
        clk: shmobile: rcar-gen2: Add CPG/MSTP Clock Domain support
        clk: shmobile: r8a7779: Add CPG/MSTP Clock Domain support
        clk: shmobile: r8a7778: Add CPG/MSTP Clock Domain support
        clk: shmobile: Add CPG/MSTP Clock Domain support
        ARM: dove: create a proper PMU driver for power domains, PMU IRQs and resets
        reset: reset-zynq: Adding support for Xilinx Zynq reset controller.
        docs: dts: Added documentation for Xilinx Zynq Reset Controller bindings.
        MIPS: ath79: Add the reset controller to the AR9132 dtsi
        reset: Add a driver for the reset controller on the AR71XX/AR9XXX
        devicetree: Add bindings for the ATH79 reset controller
        reset: socfpga: Update reset-socfpga to read the altr,modrst-offset property
        doc: dt: add documentation for lpc1850-rgu reset driver
        ...
      10217810
    • Linus Torvalds's avatar
      Merge tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 50686e8a
      Linus Torvalds authored
      Pull ARM SoC platform updates from Olof Johansson:
       "New or improved SoC support:
      
         - add support for Atmel's SAMA5D2 SoC
         - add support for Freescale i.MX6UL
         - improved support for TI's DM814x platform
         - misc fixes and improvements for RockChip platforms
         - Marvell MVEBU suspend/resume support
      
        A few driver changes that ideally would belong in the drivers branch
        are also here (acked by appropriate maintainers):
      
         - power key input driver for Freescale platforms (svns)
         - RTC driver updates for Freescale platforms (svns/mxc)
         - clk fixes for TI DM814/816X
      
        + a bunch of other changes for various platforms"
      
      * tag 'armsoc-soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (83 commits)
        ARM: rockchip: pm: Fix PTR_ERR() argument
        ARM: imx: mach-imx6ul: Fix allmodconfig build
        clk: ti: fix for definition movement
        ARM: uniphier: drop v7_invalidate_l1 call at secondary entry
        memory: kill off set_irq_flags usage
        rtc: snvs: select option REGMAP_MMIO
        ARM: brcmstb: select ARCH_DMA_ADDR_T_64BIT for LPAE
        ARM: BCM: Enable ARM erratum 798181 for BRCMSTB
        ARM: OMAP2+: Fix power domain operations regression caused by 81xx
        ARM: rockchip: enable PMU_GPIOINT_WAKEUP_EN when entering shallow suspend
        ARM: rockchip: set correct stabilization thresholds in suspend
        ARM: rockchip: rename osc_switch_to_32k variable
        ARM: imx6ul: add fec MAC refrence clock and phy fixup init
        ARM: imx6ul: add fec bits to GPR syscon definition
        rtc: mxc: add support of device tree
        dt-binding: document the binding for mxc rtc
        rtc: mxc: use a second rtc clock
        ARM: davinci: cp_intc: use IRQCHIP_SKIP_SET_WAKE instead of irq_set_wake callback
        soc: mediatek: Fix SCPSYS compilation
        ARM: at91/soc: add basic support for new sama5d2 SoC
        ...
      50686e8a
    • Linus Torvalds's avatar
      Merge tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · c5fc2498
      Linus Torvalds authored
      Pull ARM SoC cleanups from Olof Johansson:
       "A large cleanup branch this release, with a healthy 10k negative line
        delta.
      
        Most of this is removal of legacy (non-DT) support of shmobile
        platforms.  There is also removal of two non-DT platforms on OMAP, and
        the plat-samsung directory is cleaned out by moving most of the
        previously shared-location-but-not-actually-shared files from there to
        the appropriate mach directories instead.
      
        There are other sets of changes in here as well:
      
         - Rob Herring removed use of set_irq_flags under all platforms and
           moved to genirq alternatives
      
         - a series of timer API conversions to set-state interface
      
         - ep93xx, nomadik and ux500 cleanups from Linus Walleij
      
         - __init annotation fixes from Nicolas Pitre
      
         + a bunch of other changes that all add up to a nice set of cleanups"
      
      * tag 'armsoc-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (108 commits)
        ARM/fb: ep93xx: switch framebuffer to use modedb only
        ARM: gemini: Setup timer3 as free running timer
        ARM: gemini: Use timer1 for clockevent
        ARM: gemini: Add missing register definitions for gemini timer
        ARM: ep93xx/timer: Migrate to new 'set-state' interface
        ARM: nomadik: push accelerometer down to boards
        ARM: nomadik: move l2x0 setup to device tree
        ARM: nomadik: selectively enable UART0 on boards
        ARM: nomadik: move hog code to use DT hogs
        ARM: shmobile: Fix mismerges
        ARM: ux500: simplify secondary CPU boot
        ARM: SAMSUNG: remove keypad-core header in plat-samsung
        ARM: SAMSUNG: local watchdog-reset header in mach-s3c64xx
        ARM: SAMSUNG: local onenand-core header in mach-s3c64xx
        ARM: SAMSUNG: local irq-uart header in mach-s3c64xx
        ARM: SAMSUNG: local backlight header in mach-s3c64xx
        ARM: SAMSUNG: local ata-core header in mach-s3c64xx
        ARM: SAMSUNG: local regs-usb-hsotg-phy header in mach-s3c64xx
        ARM: SAMSUNG: local spi-core header in mach-s3c24xx
        ARM: SAMSUNG: local nand-core header in mach-s3c24xx
        ...
      c5fc2498
    • Linus Torvalds's avatar
      Merge tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 00e3fcc2
      Linus Torvalds authored
      Pull ARM SoC non-urgent fixes from Olof Johansson:
       "We normally collect non-urgent fixes during the release cycle and
        queue them for the merge window.
      
        This time around the list is short (in part because some have gone in
        other branches).
      
         - Maintainers addition for bcm2835
         - IRQ number fix for orion5x (been present since 3.18)
         - DT fix for display on exynos3250
         - Exynos fix to use of IOMEM_ERR_PTR properly"
      
      * tag 'armsoc-fixes-nc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: orion5x: fix legacy orion5x IRQ numbers
        MAINTAINERS: Explicitly add linux-arm-kernel for bcm2835
        MAINTAINERS: Add myself as a bcm2835 co-maintainer.
        ARM: EXYNOS: Use IOMEM_ERR_PTR when function returns iomem
        ARM: dts: fix clock-frequency of display timing0 for exynos3250-rinato
      00e3fcc2
    • Linus Torvalds's avatar
      Merge tag 'arc-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · 28dce7c7
      Linus Torvalds authored
      Pull ARC architecture updates from Vineet Gupta:
       "ARC updates for 4.3:
      
         - perf support for ARCv2 based cores (sampling interrupt, SMP)
         - leftovers for ARCv2 support
         - futex fixes"
      
      * tag 'arc-4.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
        ARCv2: entry: Fix reserved handler
        ARCv2: perf: Finally introduce HS perf unit
        ARCv2: perf: SMP support
        ARCv2: perf: implement exclusion of event counting in user or kernel mode
        ARCv2: perf: Support sampling events using overflow interrupts
        ARCv2: perf: implement "event_set_period"
        ARC: perf: cap the number of counters to hardware max of 32
        ARC: Eliminate some ARCv2 specific code for ARCompact build
        ARC: add/fix some comments in code - no functional change
        ARC: change some branchs to jumps to resolve linkage errors
        ARC: ensure futex ops are atomic in !LLSC config
        ARC: Enable HAVE_FUTEX_CMPXCHG
        ARC: make futex_atomic_cmpxchg_inatomic() return bimodal
        ARC: futex cosmetics
        ARC: add barriers to futex code
        ARCv2: IOC: Allow boot time disable
        ARCv2: SLC: Allow boot time disable
        ARCv2: Support IO Coherency and permutations involving L1 and L2 caches
        ARC: Enable optimistic spinning for LLSC config
        MAINTAINERS: add git tree for the arc architecture
      28dce7c7
    • Linus Torvalds's avatar
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 361f7d17
      Linus Torvalds authored
      Pull x86 core platform updates from Ingo Molnar:
       "The main changes are:
      
         - Intel Atom platform updates.  (Andy Shevchenko)
      
         - modularity fixlets.  (Paul Gortmaker)
      
         - x86 platform clockevents driver updates for lguest, uv and Xen.
           (Viresh Kumar)
      
         - Microsoft Hyper-V TSC fixlet.  (Vitaly Kuznetsov)"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/platform: Make atom/pmc_atom.c explicitly non-modular
        x86/hyperv: Mark the Hyper-V TSC as unstable
        x86/xen/time: Migrate to new set-state interface
        x86/uv/time: Migrate to new set-state interface
        x86/lguest/timer: Migrate to new set-state interface
        x86/pci/intel_mid_pci: Use proper constants for irq polarity
        x86/pci/intel_mid_pci: Make intel_mid_pci_ops static
        x86/pci/intel_mid_pci: Propagate actual return code
        x86/pci/intel_mid_pci: Work around for IRQ0 assignment
        x86/platform/iosf_mbi: Add Intel Tangier PCI id
        x86/platform/iosf_mbi: Source cleanup
        x86/platform/iosf_mbi: Remove NULL pointer checks for pci_dev_put()
        x86/platform/iosf_mbi: Check return value of debugfs_create properly
        x86/platform/iosf_mbi: Move to dedicated folder
        x86/platform/intel/pmc_atom: Move the PMC-Atom code to arch/x86/platform/atom
        x86/platform/intel/pmc_atom: Add Cherrytrail PMC interface
        x86/platform/intel/pmc_atom: Supply register mappings via PMC object
        x86/platform/intel/pmc_atom: Print index of device in loop
        x86/platform/intel/pmc_atom: Export accessors to PMC registers
      361f7d17
    • Linus Torvalds's avatar
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 25525bea
      Linus Torvalds authored
      Pull x86 mm updates from Ingo Molnar:
       "The dominant change in this cycle was the continued work to isolate
        kernel drivers from MTRR legacies: this tree gets rid of all kernel
        internal driver interfaces to MTRRs (mostly by rewriting it to proper
        PAT interfaces), the only access left is the /proc/mtrr ABI.
      
        This work was done by Luis R Rodriguez.
      
        There's also some related PCI interface additions for which I've
        Cc:-ed Bjorn"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (21 commits)
        x86/mm/mtrr: Remove kernel internal MTRR interfaces: unexport mtrr_add() and mtrr_del()
        s390/io: Add pci_iomap_wc() and pci_iomap_wc_range()
        drivers/dma/iop-adma: Use dma_alloc_writecombine() kernel-style
        drivers/video/fbdev/vt8623fb: Use arch_phys_wc_add() and pci_iomap_wc()
        drivers/video/fbdev/s3fb: Use arch_phys_wc_add() and pci_iomap_wc()
        drivers/video/fbdev/arkfb.c: Use arch_phys_wc_add() and pci_iomap_wc()
        PCI: Add pci_iomap_wc() variants
        drivers/video/fbdev/gxt4500: Use pci_ioremap_wc_bar() to map framebuffer
        drivers/video/fbdev/kyrofb: Use arch_phys_wc_add() and pci_ioremap_wc_bar()
        drivers/video/fbdev/i740fb: Use arch_phys_wc_add() and pci_ioremap_wc_bar()
        PCI: Add pci_ioremap_wc_bar()
        x86/mm: Make kernel/check.c explicitly non-modular
        x86/mm/pat: Make mm/pageattr[-test].c explicitly non-modular
        x86/mm/pat: Add comments to cachemode translation tables
        arch/*/io.h: Add ioremap_uc() to all architectures
        drivers/video/fbdev/atyfb: Use arch_phys_wc_add() and ioremap_wc()
        drivers/video/fbdev/atyfb: Replace MTRR UC hole with strong UC
        drivers/video/fbdev/atyfb: Clarify ioremap() base and length used
        drivers/video/fbdev/atyfb: Carve out framebuffer length fudging into a helper
        x86/mm, asm-generic: Add IOMMU ioremap_uc() variant default
        ...
      25525bea
    • Linus Torvalds's avatar
      Merge branch 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2962156d
      Linus Torvalds authored
      Pull x86 irq fixlet from Ingo Molnar:
       "A single change that hides the 'HYP:' line in /proc/interrupts when
        it's unused"
      
      * 'x86-irq-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/irq: Hide 'HYP:' line in /proc/interrupts when not on Xen/Hyper-V
      2962156d
    • Keith Busch's avatar
      blk: Fix bio_io_vec index when checking bvec gaps · 2ca495ac
      Keith Busch authored
      Corrects a coding error from earlier patch.
      
      Reported by: Sagi Grimberg <sagig@dev.mellanox.co.il>
      Signed-off-by: default avatarKeith Busch <keith.busch@intel.com>
      Fixes: 03100aad ("block: Replace SG_GAPS with new queue limits mask")
      Signed-off-by: default avatarJens Axboe <axboe@fb.com>
      2ca495ac
    • Linus Torvalds's avatar
      Merge branch 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 6b2282aa
      Linus Torvalds authored
      Pull x86 cpu updates from Ingo Molnar:
       "Two changes: a suspend/resume quirk and a new CPUID bit definition"
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/cpufeature: Add feature bit for Intel's Silicon Debug CPUID bit
        x86/cpu: Restore MSR_IA32_ENERGY_PERF_BIAS after resume
      6b2282aa