1. 21 1月, 2017 6 次提交
    • L
      Merge tag 'spi-fix-v4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · cca112ec
      Linus Torvalds 提交于
      Pull spi fixes from Mark Brown:
       "The usual small smattering of driver specific fixes. A few bits that
        stand out here:
      
         - the R-Car patches adding fallbacks are just adding new compatible
           strings to the driver so that device trees are written in a more
           robustly future proof fashion, this isn't strictly a fix but it's
           just new IDs and it's better to get it into mainline sooner to
           improve the ABI
      
         - the DesignWare "switch to new API part 2" patch is actually a
           misleadingly titled fix for a bit that got missed in the original
           conversion"
      
      * tag 'spi-fix-v4.10-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: davinci: use dma_mapping_error()
        spi: spi-axi: Free resources on error path
        spi: pxa2xx: add missed break
        spi: dw-mid: switch to new dmaengine_terminate_* API (part 2)
        spi: dw: Make debugfs name unique between instances
        spi: sh-msiof: Do not use C++ style comment
        spi: armada-3700: Set mode bits correctly
        spi: armada-3700: fix unsigned compare than zero on irq
        spi: sh-msiof: Add R-Car Gen 2 and 3 fallback bindings
        spi: SPI_FSL_DSPI should depend on HAS_DMA
      cca112ec
    • L
      Merge tag 'ceph-for-4.10-rc5' of git://github.com/ceph/ceph-client · e90665a5
      Linus Torvalds 提交于
      Pull ceph fixes from Ilya Dryomov:
       "Three filesystem endianness fixes (one goes back to the 2.6 era, all
        marked for stable) and two fixups for this merge window's patches"
      
      * tag 'ceph-for-4.10-rc5' of git://github.com/ceph/ceph-client:
        ceph: fix bad endianness handling in parse_reply_info_extra
        ceph: fix endianness bug in frag_tree_split_cmp
        ceph: fix endianness of getattr mask in ceph_d_revalidate
        libceph: make sure ceph_aes_crypt() IV is aligned
        ceph: fix ceph_get_caps() interruption
      e90665a5
    • L
      Merge branch 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 56ef1882
      Linus Torvalds 提交于
      Pull overlayfs fix from Miklos Szeredi:
       "This fixes a regression introduced in this cycle"
      
      * 'overlayfs-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: fix possible use after free on redirect dir lookup
      56ef1882
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · eefa9feb
      Linus Torvalds 提交于
      Pull fuse fixes from Miklos Szeredi:
       "Fix two regressions, one introduced in 4.9 and a less recent one in
        4.2"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: fix time_to_jiffies nsec sanity check
        fuse: clear FR_PENDING flag when moving requests out of pending queue
      eefa9feb
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · f09ff1de
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "This is a set of 12 fixes including the mpt3sas one that was causing
        hangs on ATA passthrough.
      
        The others are a couple of zoned block device fixes, a SAS device
        detection bug which lead to SATA drives not being matched to bays, two
        qla2xxx MSI fixes, a qla2xxx req for rsp confusion caused by cut and
        paste, and a few other minor fixes"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: mpt3sas: fix hang on ata passthrough commands
        scsi: lpfc: Set elsiocb contexts to NULL after freeing it
        scsi: sd: Ignore zoned field for host-managed devices
        scsi: sd: Fix wrong DPOFUA disable in sd_read_cache_type
        scsi: bfa: fix wrongly initialized variable in bfad_im_bsg_els_ct_request()
        scsi: ses: Fix SAS device detection in enclosure
        scsi: libfc: Fix variable name in fc_set_wwpn
        scsi: lpfc: avoid double free of resource identifiers
        scsi: qla2xxx: remove irq_affinity_notifier
        scsi: qla2xxx: fix MSI-X vector affinity
        scsi: qla2xxx: Fix apparent cut-n-paste error.
        scsi: qla2xxx: Get mutex lock before checking optrom_state
      f09ff1de
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · f8f2d4bd
      Linus Torvalds 提交于
      Pull arm64 fixes from Catalin Marinas:
      
       - avoid potential stack information leak via the ptrace ABI caused by
         uninitialised variables
      
       - SWIOTLB DMA API fall-back allocation fix when the SWIOTLB buffer is
         not initialised (all RAM is suitable for 32-bit DMA masks)
      
       - fix the bad_mode function returning for unhandled exceptions coming
         from user space
      
       - fix name clash in __page_to_voff()
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: avoid returning from bad_mode
        arm64/ptrace: Reject attempts to set incomplete hardware breakpoint fields
        arm64/ptrace: Avoid uninitialised struct padding in fpr_set()
        arm64/ptrace: Preserve previous registers for short regset write
        arm64/ptrace: Preserve previous registers for short regset write
        arm64/ptrace: Preserve previous registers for short regset write
        arm64: mm: avoid name clash in __page_to_voff()
        arm64: Fix swiotlb fallback allocation
      f8f2d4bd
  2. 20 1月, 2017 7 次提交
    • L
      Merge tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 44b4b461
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "We've been sitting on fixes for a while, and they keep trickling in at
        a low rate. Nothing in here comes across as particularly scary or
        noteworthy, for the most part it's a large collection of small DT
        tweaks"
      
      * tag 'armsoc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (24 commits)
        ARM: dts: da850-evm: fix read access to SPI flash
        ARM: dts: omap3: Fix Card Detect and Write Protect on Logic PD SOM-LV
        ARM64: dts: meson-gxbb-odroidc2: Disable SCPI DVFS
        ARM: dts: OMAP5 / DRA7: indicate that SATA port 0 is available.
        ARM: dts: NSP: Fix DT ranges error
        ARM: multi_v7_defconfig: set bcm47xx watchdog
        ARM: multi_v7_defconfig: fix config typo
        ARM: dts: dra72-evm-revc: fix typo in ethernet-phy node
        soc: ti: wkup_m3_ipc: Fix error return code in wkup_m3_ipc_probe()
        ARM: ux500: fix prcmu_is_cpu_in_wfi() calculation
        ARM: dts: sunxi: Change node name for pwrseq pin on Olinuxino-lime2-emmc
        ARM: dts: sun8i: Support DTB build for NanoPi M1
        ARM: dts: sun6i: hummingbird: Enable display engine again
        ARM: dts: sun6i: Disable display pipeline by default
        ARM, ARM64: dts: drop "arm,amba-bus" in favor of "simple-bus" part 3
        ARM: dts: imx6qdl-nitrogen6_som2: fix sgtl5000 pinctrl init
        ARM: dts: imx6qdl-nitrogen6_max: fix sgtl5000 pinctrl init
        ARM: OMAP1: DMA: Correct the number of logical channels
        ARM: dts: am335x-icev2: Remove the duplicated pinmux setting
        ARM: OMAP2+: Fix WL1283 Bluetooth Baud Rate
        ...
      44b4b461
    • L
      Merge tag 'xfs-for-linux-4.10-rc5-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux · 6e0362b3
      Linus Torvalds 提交于
      Pull xfs fixes from Darrick Wong:
       "I have a few more patches this week -- one to make the behavior of a
        quota id ioctl consistent with the other filesystems, and the rest
        improve validation of i_mode & i_size values coming into xfs so that
        we don't read off the ends of arrays or crash when handed garbage disk
        data.
      
        Summary:
         - inode i_mode sanitization
         - prevent overflows in getnextquota
         - minor build fixes"
      
      * tag 'xfs-for-linux-4.10-rc5-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux:
        xfs: fix xfs_mode_to_ftype() prototype
        xfs: don't wrap ID in xfs_dq_get_next_id
        xfs: sanity check inode di_mode
        xfs: sanity check inode mode when creating new dentry
        xfs: replace xfs_mode_to_ftype table with switch statement
        xfs: add missing include dependencies to xfs_dir2.h
        xfs: sanity check directory inode di_size
        xfs: make the ASSERT() condition likely
      6e0362b3
    • F
      ARM: dts: da850-evm: fix read access to SPI flash · 43849785
      Fabien Parent 提交于
      Read access to the SPI flash are broken on da850-evm, i.e. the data
      read is not what is actually programmed on the flash.
      According to the datasheet for the M25P64 part present on the da850-evm,
      if the SPI frequency is higher than 20MHz then the READ command is not
      usable anymore and only the FAST_READ command can be used to read data.
      
      This commit specifies in the DTS that we should use FAST_READ command
      instead of the READ command.
      
      Cc: stable@vger.kernel.org
      Tested-by: NKevin Hilman <khilman@baylibre.com>
      Signed-off-by: NFabien Parent <fparent@baylibre.com>
      [nsekhar@ti.com: subject line adjustment]
      Signed-off-by: NSekhar Nori <nsekhar@ti.com>
      Signed-off-by: NOlof Johansson <olof@lixom.net>
      43849785
    • L
      Merge tag 'pci-v4.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 81aaeaac
      Linus Torvalds 提交于
      Pull PCI fixes from Bjorn Helgaas:
      
       - recognize that a PCI-to-PCIe bridge originates a PCIe hierarchy, so
         we enumerate that hierarchy correctly
      
       - X-Gene: fix a change merged for v4.10 that broke MSI
      
       - Keystone: avoid reading undefined registers, which can cause
         asynchronous external aborts
      
       - Supermicro X8DTH-i/6/iF/6F: ignore broken _CRS that caused us to
         change (and break) existing I/O port assignments
      
      * tag 'pci-v4.10-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI/MSI: pci-xgene-msi: Fix CPU hotplug registration handling
        PCI: Enumerate switches below PCI-to-PCIe bridges
        x86/PCI: Ignore _CRS on Supermicro X8DTH-i/6/iF/6F
        PCI: designware: Check for iATU unroll only on platforms that use ATU
      81aaeaac
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 2ed5e5af
      Linus Torvalds 提交于
      Pull HID fixes from Jiri Kosina:
      
       - regression fix for generic Wacom devices, from Jason Gerecke
      
       - DMA-on-stack fixes for hid-corsair driver, from Johan Hovold
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: wacom: Fix sibling detection regression
        HID: corsair: fix control-transfer error handling
        HID: corsair: fix DMA buffers on stack
      2ed5e5af
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 4a1cc2e8
      Linus Torvalds 提交于
      Pull two s390 bug fixes from Martin Schwidefsky:
       "Two changes, the first is a fix to add a missing memory clobber to the
        inline assembly to load control registers. This has not caused any
        issues so far, but who knows what code gcc will generate in future
        versions.
      
        The second change is an update for the default configurations. This
        includes CONFIG_BUG_ON_DATA_CORRUPTION=y, we want this to be enabled
        for s390. The usual approach to debug problems on production systems
        is to use crash on a system dump and for us avoiding data corruptions
        is priority one"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
        s390: update defconfigs
        s390/ctl_reg: make __ctl_load a full memory barrier
      4a1cc2e8
    • L
      Merge tag 'for-linus-4.10-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 08667577
      Linus Torvalds 提交于
      Pull xen fix from Juergen Gross:
       "A fix for Xen running in nested virtualization environment"
      
      * tag 'for-linus-4.10-rc4-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        partially revert "xen: Remove event channel notification through Xen PCI platform device"
      08667577
  3. 19 1月, 2017 20 次提交
  4. 18 1月, 2017 7 次提交