1. 26 2月, 2017 6 次提交
    • L
      Merge branch 'i2c/for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · 7067739d
      Linus Torvalds 提交于
      Pull i2c updates from Wolfram Sang:
       "I2C has for you two new drivers (Tegra BPMP and STM32F4), interrupt
        support for pca954x muxes, and a bunch of driver bugfixes and
        improvements. Nothing really special this cycle.
      
        A few commits have been added to my tree just recently. Those are the
        Tegra BPMP driver and a few straightforward bugfixes or cleanups which
        I prefer to have upstream rather soonish. The rest had proper
        linux-next exposure"
      
      * 'i2c/for-4.11' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux: (25 commits)
        i2c: thunderx: Replace pci_enable_msix()
        i2c: exynos5: fix arbitration lost handling
        i2c: exynos5: disable fifo-almost-empty irq signal when necessary
        i2c: at91: ensure state is restored after suspending
        i2c: bcm2835: Avoid possible NULL ptr dereference
        i2c: Add Tegra BPMP I2C proxy driver
        dt-bindings: Add Tegra186 BPMP I2C binding
        misc: eeprom: at24: use device_property_*() functions instead of of_get_property()
        i2c: mux: pca954x: Add interrupt controller support
        dt: bindings: i2c-mux-pca954x: Add documentation for interrupt controller
        i2c: mux: pca954x: Add missing pca9542 definition to chip_desc
        i2c: riic: correctly finish transfers
        i2c: i801: Add support for Intel Gemini Lake
        i2c: mux: pca9541: Export OF device ID table as module aliases
        i2c: mux: pca954x: Export OF device ID table as module aliases
        i2c: mux: mlxcpld: remove unused including <linux/version.h>
        i2c: busses: constify i2c_algorithm structures
        i2c: i2c-mux-gpio: rename i2c-gpio-mux to i2c-mux-gpio
        i2c: sh_mobile: document support for r8a7796 (R-Car M3-W)
        i2c: i2c-cros-ec-tunnel: Reduce logging noise
        ...
      7067739d
    • L
      Merge tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · ac1820fb
      Linus Torvalds 提交于
      Pull rdma DMA mapping updates from Doug Ledford:
       "Drop IB DMA mapping code and use core DMA code instead.
      
        Bart Van Assche noted that the ib DMA mapping code was significantly
        similar enough to the core DMA mapping code that with a few changes it
        was possible to remove the IB DMA mapping code entirely and switch the
        RDMA stack to use the core DMA mapping code.
      
        This resulted in a nice set of cleanups, but touched the entire tree
        and has been kept separate for that reason."
      
      * tag 'for-next-dma_ops' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (37 commits)
        IB/rxe, IB/rdmavt: Use dma_virt_ops instead of duplicating it
        IB/core: Remove ib_device.dma_device
        nvme-rdma: Switch from dma_device to dev.parent
        RDS: net: Switch from dma_device to dev.parent
        IB/srpt: Modify a debug statement
        IB/srp: Switch from dma_device to dev.parent
        IB/iser: Switch from dma_device to dev.parent
        IB/IPoIB: Switch from dma_device to dev.parent
        IB/rxe: Switch from dma_device to dev.parent
        IB/vmw_pvrdma: Switch from dma_device to dev.parent
        IB/usnic: Switch from dma_device to dev.parent
        IB/qib: Switch from dma_device to dev.parent
        IB/qedr: Switch from dma_device to dev.parent
        IB/ocrdma: Switch from dma_device to dev.parent
        IB/nes: Remove a superfluous assignment statement
        IB/mthca: Switch from dma_device to dev.parent
        IB/mlx5: Switch from dma_device to dev.parent
        IB/mlx4: Switch from dma_device to dev.parent
        IB/i40iw: Remove a superfluous assignment statement
        IB/hns: Switch from dma_device to dev.parent
        ...
      ac1820fb
    • L
      Merge tag 'fbdev-v4.11' of git://github.com/bzolnier/linux · edccb594
      Linus Torvalds 提交于
      Pull fbdev updates from Bartlomiej Zolnierkiewicz:
      
       - fix for font color when console is switched to another fb driver
      
       - deferred probing fixes for simplefb driver
      
       - preparations to add support of an optional GPIO to enable panel for
         ARM CLCD driver
      
       - some improvements for ssd1307fb driver
      
       - cleanups for OMAP fbdev LCD drivers
      
       - misc fixes/cleanups for various fb drivers
      
      * tag 'fbdev-v4.11' of git://github.com/bzolnier/linux: (30 commits)
        video: fbdev: fsl-diu-fb: fix spelling mistake "palette"
        fbdev: ssd1307fb: include linux/gpio/consumer.h
        video: fbdev: fsl-diu-fb: remove impossible condition
        video: fbdev: amifb: remove impossible condition
        fbdev/ssd1307fb: clear screen in probe
        fbdev/ssd1307fb: add support to enable VBAT
        fbdev: ssd1307fb: Make reset gpio devicetree property optional
        fbdev: ssd1307fb: Remove reset-active-low from the DT binding document
        fbdev: ssd1307fb: Start to use gpiod API for reset gpio
        video: fbdev: sh_mobile_lcdcfb: fix error return code in sh_mobile_lcdc_probe()
        video: fbdev: offb: switch to using for_each_node_by_type
        video/console: use setup_timer and mod_timer instead of init_timer
        fbdev: omap/lcd: Make callbacks optional
        fbdev: omap/lcd: Staticize non-exported lcd_panel structs
        fbdev: omap/lcd: Remove no-op driver callbacks
        video/mbx: use simple_open()
        video: fbdev: stifb: handle NULL return value from ioremap_nocache
        video: fbdev: pmagb-b-fb: Remove bad `__init' annotation
        video: fbdev: pmag-ba-fb: Remove bad `__init' annotation
        video: ARM CLCD: use panel device node for getting backlight and mode
        ...
      edccb594
    • J
      treewide: Remove remaining executable attributes from source files · 6e5c8381
      Joe Perches 提交于
      These are the current source files that should not have
      executable attributes set.
      
      [ Normally this would be sent through Andrew Morton's tree
        but his quilt tools don't like permission only patches. ]
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6e5c8381
    • L
      Merge branch 'akpm' (patches from Andrew) · 7b46588f
      Linus Torvalds 提交于
      Merge more updates from Andrew Morton:
      
       - almost all of the rest of MM
      
       - misc bits
      
       - KASAN updates
      
       - procfs
      
       - lib/ updates
      
       - checkpatch updates
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (124 commits)
        checkpatch: remove false unbalanced braces warning
        checkpatch: notice unbalanced else braces in a patch
        checkpatch: add another old address for the FSF
        checkpatch: update $logFunctions
        checkpatch: warn on logging continuations
        checkpatch: warn on embedded function names
        lib/lz4: remove back-compat wrappers
        fs/pstore: fs/squashfs: change usage of LZ4 to work with new LZ4 version
        crypto: change LZ4 modules to work with new LZ4 module version
        lib/decompress_unlz4: change module to work with new LZ4 module version
        lib: update LZ4 compressor module
        lib/test_sort.c: make it explicitly non-modular
        lib: add CONFIG_TEST_SORT to enable self-test of sort()
        rbtree: use designated initializers
        linux/kernel.h: fix DIV_ROUND_CLOSEST to support negative divisors
        lib/find_bit.c: micro-optimise find_next_*_bit
        lib: add module support to atomic64 tests
        lib: add module support to glob tests
        lib: add module support to crc32 tests
        kernel/ksysfs.c: add __ro_after_init to bin_attribute structure
        ...
      7b46588f
    • T
      mac80211_hwsim: Replace bogus hrtimer clockid · 915f3e3f
      Thomas Gleixner 提交于
      mac80211_hwsim initializes a hrtimer with clockid CLOCK_MONOTONIC_RAW.
      That's not supported.
      
      Use CLOCK_MONOTNIC instead.
      Signed-off-by: NThomas Gleixner <tglx@linutronix.de>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      915f3e3f
  2. 25 2月, 2017 34 次提交