1. 11 Nov, 2015 17 commits
  2. 10 Nov, 2015 15 commits
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 42d4ebb4
      Linus Torvalds authored
      Pull watchdog update from Wim Van Sebroeck:
      
       - New driver for Broadcom 7038 Set-Top Box
       - imx2_wdt: Use register definition in regmap_write()
       - intel-mid: add Magic Closure flag
       - watchdog framework improvements:
            - Use device tree alias for naming watchdogs
            - propagate ping error code to the user space
            - Always evaluate new timeout against min_timeout
            - Use single variable name for struct watchdog_device
       - include clean-ups
      
      * git://www.linux-watchdog.org/linux-watchdog:
        watchdog: include: add units for timeout values in kerneldoc
        watchdog: include: fix some typos
        watchdog: core: propagate ping error code to the user space
        watchdog: watchdog_dev: Use single variable name for struct watchdog_device
        watchdog: Always evaluate new timeout against min_timeout
        watchdog: intel-mid: add Magic Closure flag
        watchdog: imx2_wdt: Use register definition in regmap_write()
        watchdog: watchdog_dev: Use device tree alias for naming watchdogs
        watchdog: Watchdog driver for Broadcom Set-Top Box
        watchdog: bcm7038: add device tree binding documentation
      42d4ebb4
    • Linus Torvalds's avatar
      Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging · 6aabef68
      Linus Torvalds authored
      Pull tiny hwmon update from Jean Delvare.
      
      * 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
        hwmon: (k10temp) Remove duplicate pci-id define
      6aabef68
    • Linus Torvalds's avatar
      Merge tag 'ntb-4.4' of git://github.com/jonmason/ntb · 1eb196c3
      Linus Torvalds authored
      Pull NTB bugfixes from Jon Mason:
       "NTB Bug fixes for potential NULL pointer accesses, accesses of a freed
        pointer, invalid buffer pointer, and a compiler warning.
      
        Also, unification of upstream/downstream addresses"
      
      * tag 'ntb-4.4' of git://github.com/jonmason/ntb:
        NTB: fix 32-bit compiler warning
        NTB: unify translation addresses
        NTB: invalid buf pointer in multi-MW setups
        NTB: remove unused variable
        NTB: fix access of free-ed pointer
        NTB: Fix issue where we may be accessing NULL ptr
      1eb196c3
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma · 041c7951
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "This time we have a very typical update which is mostly fixes and
        updates to drivers and no new drivers.
      
         - the biggest change is coming from Peter for edma cleanup which even
           caused some last minute regression, things seem settled now
         - idma64 and dw updates
         - iotdma updates
         - module autoload fixes for various drivers
         - scatter gather support for hdmac"
      
      * tag 'dmaengine-4.4-rc1' of git://git.infradead.org/users/vkoul/slave-dma: (77 commits)
        dmaengine: edma: Add dummy driver skeleton for edma3-tptc
        Revert "ARM: DTS: am33xx: Use the new DT bindings for the eDMA3"
        Revert "ARM: DTS: am437x: Use the new DT bindings for the eDMA3"
        dmaengine: dw: some Intel devices has no memcpy support
        dmaengine: dw: platform: provide platform data for Intel
        dmaengine: dw: don't override platform data with autocfg
        dmaengine: hdmac: Add scatter-gathered memset support
        dmaengine: hdmac: factorise memset descriptor allocation
        dmaengine: virt-dma: Fix kernel-doc annotations
        ARM: DTS: am437x: Use the new DT bindings for the eDMA3
        ARM: DTS: am33xx: Use the new DT bindings for the eDMA3
        dmaengine: edma: New device tree binding
        dmaengine: Kconfig: edma: Select TI_DMA_CROSSBAR in case of ARCH_OMAP
        dmaengine: ti-dma-crossbar: Add support for crossbar on AM33xx/AM43xx
        dmaengine: edma: Merge the of parsing functions
        dmaengine: edma: Do not allocate memory for edma_rsv_info in case of DT boot
        dmaengine: edma: Refactor the dma device and channel struct initialization
        dmaengine: edma: Get qDMA channel information from HW also
        dmaengine: edma: Merge map_dmach_to_queue into assign_channel_eventq
        dmaengine: edma: Correct PaRAM access function names (_parm_ to _param_)
        ...
      041c7951
    • Linus Torvalds's avatar
      Merge tag 'rtc-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 7d884710
      Linus Torvalds authored
      Pull RTC updates from Alexandre Belloni:
       "Core:
         - Fix rtctest error path
      
        New drivers:
         - Microcrystal RV8803
      
        Subsystem wide cleanups:
         - remove misuse of IRQF_NO_SUSPEND flag
      
        Drivers:
         - at91rm9200: clear RTC alarm status flag prior to suspending
         - davinci: remove incorrect reference to probe function
         - ds1307: Fix alarm programming for mcp794xx
         - ds1390: trickle charger support, fix ds1390_get_reg
         - isl1208: Pass the IRQF_ONESHOT flag
         - opal: fix type of token
         - pcf2127: fix RTC_READ_VL, remove useless driver version
         - pcf85063: return an error when date is invalid
         - pcf8563: add CLKOUT to common clock framework
         - rx8025: remove unnecessary braces
         - s3c: Set year, month, day value for setting alarm
         - stmp3xxx: unify register access macros
         - License fixes: pcf2127, da9063
         - wakeup-source support for isl12057 and opal"
      
      * tag 'rtc-v4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (23 commits)
        rtc: Add a driver for Micro Crystal RV8803
        rtc: s3c: Set year, month, day value for setting alarm
        rtc: ds1307: Fix alarm programming for mcp794xx
        rtc: isl12057: enable support for the standard "wakeup-source" property
        rtc: opal: enable support for the stardard "wakeup-source" property
        rtc: isl1208: Pass the IRQF_ONESHOT flag
        rtc: pcf8563: add CLKOUT to common clock framework
        rtc: davinci: remove incorrect reference to probe function
        rtc: at91rm9200: clear RTC alarm status flag prior to suspending
        rtc: pcf2127: remove useless driver version
        rtc: pcf2127: fix reading uninitialized value on RTC_READ_VL ioctl
        rtc: stmp3xxx: unify register access macros
        rtc: da9063: GPL copyright inconsistency fix
        rtc: pcf85063: return an error when date is invalid
        rtc: rx8025: remove unnecessary braces
        rtc: ds1343: remove misuse of IRQF_NO_SUSPEND flag
        rtc: ab8500: remove misuse of IRQF_NO_SUSPEND flag
        rtc: pl031: remove misuse of IRQF_NO_SUSPEND flag
        rtc: opal: fix type of token
        rtc: ds1390: Add trickle charger device tree binding
        ...
      7d884710
    • Linus Torvalds's avatar
      Merge tag 'fbdev-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 3b138668
      Linus Torvalds authored
      Pull fbdev updates from Tomi Valkeinen:
       - omap: fix hdmi audio configuration issue
       - ssd1307fb: add ssd1309 support
       - tridentfb: support DDC
       - gxt4500: enable support for non-PPC platforms
      
      * tag 'fbdev-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        radeonfb: Deinline large functions
        gxt4500: enable panning
        gxt4500: Use arch_phys_wc_* for framebuffer
        gxt4500: fix color order
        gxt4500: fix 16bpp 565 mode
        gxt4500: enable on non-PPC architectures
        tridentfb: Add DDC support
        fb_ddc: Allow I2C adapters without SCL read capability
        fbdev: ssd1307fb: add ssd1309 support
        fbdev: ssd1307fb: alphabetize headers
        video/omap: remove invalid check
        OMAPDSS: hdmi: Reconfigure and restart audio when display is enabled
      3b138668
    • Linus Torvalds's avatar
      Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux · 3e82806b
      Linus Torvalds authored
      Pull drm updates from Dave Airlie:
       "I Was Almost Tempted To Capitalise Every Word, but then I decided I
        couldn't read it myself!
      
        I've also got one pull request for the sti driver outstanding.  It
        relied on a commit in Greg's tree and I didn't find out in time, that
        commit is in your tree now so I might send that along once this is
        merged.
      
        I also had the accidental misfortune to have access to a Skylake on my
        desk for a few days, and I've had to encourage Intel to try harder,
        which seems to be happening now.
      
        Here is the main drm-next pull request for 4.4.
      
        Highlights:
      
        New driver:
              vc4 driver for the Rasberry Pi VPU.
              (From Eric Anholt at Broadcom.)
      
        Core:
              Atomic fbdev support
              Atomic helpers for runtime pm
              dp/aux i2c STATUS_UPDATE handling
              struct_mutex usage cleanups.
              Generic of probing support.
      
        Documentation:
              Kerneldoc for VGA switcheroo code.
              Rename to gpu instead of drm to reflect scope.
      
        i915:
              Skylake GuC firmware fixes
              HPD A support
              VBT backlight fallbacks
              Fastboot by default for some systems
              FBC work
              BXT/SKL workarounds
              Skylake deeper sleep state fixes
      
        amdgpu:
              Enable GPU scheduler by default
              New atombios opcodes
              GPUVM debugging options
              Stoney support.
              Fencing cleanups.
      
        radeon:
              More efficient CS checking
      
        nouveau:
              gk20a instance memory handling improvements.
              Improved PGOB detection and GK107 support
              Kepler GDDR5 PLL statbility improvement
              G8x/GT2xx reclock improvements
              new userspace API compatiblity fixes.
      
        virtio-gpu:
              Add 3D support - qemu 2.5 has it merged for it's gtk backend.
      
        msm:
              Initial msm88896 (snapdragon 8200)
      
        exynos:
              HDMI cleanups
              Enable mixer driver byt default
              Add DECON-TV support
      
        vmwgfx:
              Move to using memremap + fixes.
      
        rcar-du:
              Add support for R8A7793/4 DU
      
        armada:
              Remove support for non-component mode
              Improved plane handling
              Power savings while in DPMS off.
      
        tda998x:
              Remove unused slave encoder support
              Use more HDMI helpers
              Fix EDID read handling
      
        dwhdmi:
              Interlace video mode support for ipu-v3/dw_hdmi
              Hotplug state fixes
              Audio driver integration
      
        imx:
              More color formats support.
      
        tegra:
              Minor fixes/improvements"
      
      [ Merge fixup: remove unused variable 'dev' that had all uses removed in
        commit 4e270f08: "drm/gem: Drop struct_mutex requirement from
        drm_gem_mmap_obj" ]
      
      * 'drm-next' of git://people.freedesktop.org/~airlied/linux: (764 commits)
        drm/vmwgfx: Relax irq locking somewhat
        drm/vmwgfx: Properly flush cursor updates and page-flips
        drm/i915/skl: disable display side power well support for now
        drm/i915: Extend DSL readout fix to BDW and SKL.
        drm/i915: Do graphics device reset under forcewake
        drm/i915: Skip fence installation for objects with rotated views (v4)
        vga_switcheroo: Drop client power state VGA_SWITCHEROO_INIT
        drm/amdgpu: group together common fence implementation
        drm/amdgpu: remove AMDGPU_FENCE_OWNER_MOVE
        drm/amdgpu: remove now unused fence functions
        drm/amdgpu: fix fence fallback check
        drm/amdgpu: fix stoping the scheduler timeout
        drm/amdgpu: cleanup on error in amdgpu_cs_ioctl()
        drm/i915: Fix locking around GuC firmware load
        drm/amdgpu: update Fiji's Golden setting
        drm/amdgpu: update Fiji's rev id
        drm/amdgpu: extract common code in vi_common_early_init
        drm/amd/scheduler: don't oops on failure to load
        drm/amdgpu: don't oops on failure to load (v2)
        drm/amdgpu: don't VT switch on suspend
        ...
      3e82806b
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patches from Andrew) · bd4f203e
      Linus Torvalds authored
      Merge third patch-bomb from Andrew Morton:
       "We're pretty much done over here - I'm still waiting for a nouveau
        merge so I can cleanly finish up Christoph's dma-mapping rework.
      
         - bunch of small misc stuff
      
         - fold abs64() into abs(), remove abs64()
      
         - new_valid_dev() cleanups
      
         - binfmt_elf_fdpic feature work"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (24 commits)
        fs/binfmt_elf_fdpic.c: provide NOMMU loader for regular ELF binaries
        fs/stat.c: remove unnecessary new_valid_dev() check
        fs/reiserfs/namei.c: remove unnecessary new_valid_dev() check
        fs/nilfs2/namei.c: remove unnecessary new_valid_dev() check
        fs/ncpfs/dir.c: remove unnecessary new_valid_dev() check
        fs/jfs: remove unnecessary new_valid_dev() checks
        fs/hpfs/namei.c: remove unnecessary new_valid_dev() check
        fs/f2fs/namei.c: remove unnecessary new_valid_dev() check
        fs/ext2/namei.c: remove unnecessary new_valid_dev() check
        fs/exofs/namei.c: remove unnecessary new_valid_dev() check
        fs/btrfs/inode.c: remove unnecessary new_valid_dev() check
        fs/9p: remove unnecessary new_valid_dev() checks
        include/linux/kdev_t.h: old/new_valid_dev() can return bool
        include/linux/kdev_t.h: remove unused huge_valid_dev()
        kmap_atomic_to_page() has no users, remove it
        drivers/scsi/cxgbi: fix build with EXTRA_CFLAGS
        dma: remove external references to dma_supported
        Documentation/sysctl/vm.txt: fix misleading code reference of overcommit_memory
        remove abs64()
        kernel.h: make abs() work with 64-bit types
        ...
      bd4f203e
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · e6604ecb
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
      
        New features:
         - RDMA client backchannel from Chuck
         - Support for NFSv4.2 file CLONE using the btrfs ioctl
      
        Bugfixes + cleanups:
         - Move socket data receive out of the bottom halves and into a
           workqueue
         - Refactor NFSv4 error handling so synchronous and asynchronous RPC
           handles errors identically.
         - Fix a panic when blocks or object layouts reads return a bad data
           length
         - Fix nfsroot so it can handle a 1024 byte long path.
         - Fix bad usage of page offset in bl_read_pagelist
         - Various NFSv4 callback cleanups+fixes
         - Fix GETATTR bitmap verification
         - Support hexadecimal number for sunrpc debug sysctl files"
      
      * tag 'nfs-for-4.4-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (53 commits)
        Sunrpc: Supports hexadecimal number for sysctl files of sunrpc debug
        nfs: Fix GETATTR bitmap verification
        nfs: Remove unused xdr page offsets in getacl/setacl arguments
        fs/nfs: remove unnecessary new_valid_dev check
        SUNRPC: fix variable type
        NFS: Enable client side NFSv4.1 backchannel to use other transports
        pNFS/flexfiles: Add support for FF_FLAGS_NO_IO_THRU_MDS
        pNFS/flexfiles: When mirrored, retry failed reads by switching mirrors
        SUNRPC: Remove the TCP-only restriction in bc_svc_process()
        svcrdma: Add backward direction service for RPC/RDMA transport
        xprtrdma: Handle incoming backward direction RPC calls
        xprtrdma: Add support for sending backward direction RPC replies
        xprtrdma: Pre-allocate Work Requests for backchannel
        xprtrdma: Pre-allocate backward rpc_rqst and send/receive buffers
        SUNRPC: Abstract backchannel operations
        xprtrdma: Saving IRQs no longer needed for rb_lock
        xprtrdma: Remove reply tasklet
        xprtrdma: Use workqueue to process RPC/RDMA replies
        xprtrdma: Replace send and receive arrays
        xprtrdma: Refactor reply handler error handling
        ...
      e6604ecb
    • Linus Torvalds's avatar
      Merge tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 9d74288c
      Linus Torvalds authored
      Pull gfs2 updates from Bob Peterson:
       "Here is a list of patches we've accumulated for GFS2 for the current
        upstream merge window.  There are only six patches this time:
      
         1. A cleanup patch from Andreas to remove the gl_spin #define in favor
            of its value for the sake of clarity.
         2. A fix from Andy Price to mark the inode dirty during fallocate.
         3. A fix from Andy Price to set s_mode on mount failures to prevent a
            stack trace.
         4  A patch from me to prevent a kernel BUG() in trans_add_meta/trans_add_data
            due to uninitialized storage.
         5. A patch from me to protecting our freeing of the in-core directory
            hash table to prevent double-free.
         6. A fix for a page/block rounding problem that resulted in a metadata
            coherency problem when the block size != page size"
      
        I've got a lot more patches in various stages of review and testing,
        but I'm afraid they'll have to wait until the next merge window.  So
        next time we're likely to have a lot more"
      
      * tag 'gfs2-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        GFS2: Fix rgrp end rounding problem for bsize < page size
        GFS2: Protect freeing directory hash table with i_lock spin_lock
        gfs2: Remove gl_spin define
        gfs2: Add missing else in trans_add_meta/data
        GFS2: Set s_mode before parsing mount options
        GFS2: fallocate: do not rely on file_update_time to mark the inode dirty
      9d74288c
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 123a28d8
      Linus Torvalds authored
      Pull ext2 fix from Jan Kara:
       "Fix for DAX on ext2"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ext2: Add locking for DAX faults
      123a28d8
    • Linus Torvalds's avatar
      Merge branch 'parisc-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 373ee21e
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       "We have two patches in here:
      
         - The parisc uapi headers have been screwed up since quite some time.
           This patch fixes some bugs (e.g. endianess not respected in
           compat_semid64_ds) and cleans them up (e.g. uid_t was used instead
           of __kernel_uid_t) so that they can be used by userspace again.
           This patch has been reviewed by Arnd Bergmann and is scheduled for
           stable kernel series.
      
         - Drop the hpux_stat64 struct from stat.h, we do not support HP-UX
           binaries since kernel 4.0"
      
      * 'parisc-4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Fixes and cleanups in kernel uapi header files
        parisc: Drop hpux_stat64 struct from stat.h header file
      373ee21e
    • Linus Torvalds's avatar
      Merge tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2 · f4d68930
      Linus Torvalds authored
      Pull nios2 updates from Ley Foon Tan:
      
       - nios2: Remove unnecessary #ifdef guards
       - nios2: Switch to generic __xchg()
       - nios2: Fix unused variable warning
      
      * tag 'nios2-v4.4-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2:
        nios2: Remove unnecessary #ifdef guards
        nios2: Switch to generic __xchg()
        nios2: Fix unused variable warning
      f4d68930
    • Linus Torvalds's avatar
      Merge tag 'xtensa-20151108' of git://github.com/czankel/xtensa-linux · 3510ca19
      Linus Torvalds authored
      Pull xtensa updates from Chris Zankel:
      
       - fix remaining issues with noMMU cores
       - fix build for cores w/o cache or zero overhead loop options
       - fix boot of secondary cores in SMP configuration
       - add support for DMA to high memory pages
       - add dma_to_phys and phys_to_dma functions.
      
      * tag 'xtensa-20151108' of git://github.com/czankel/xtensa-linux:
        xtensa: implement dma_to_phys and phys_to_dma
        xtensa: support DMA to high memory
        Revert "xtensa: cache inquiry and unaligned cache handling functions"
        xtensa: drop unused sections and remapped reset handlers
        xtensa: fix secondary core boot in SMP
        xtensa: add FORCE_MAX_ZONEORDER to Kconfig
        xtensa: nommu: provide defconfig for de212 on kc705
        xtensa: nommu: xtfpga: add kc705 DTS
        xtensa: add de212 core variant
        xtensa: nommu: select HAVE_FUTEX_CMPXCHG
        xtensa: nommu: fix default memory start address
        xtensa: nommu: provide correct KIO addresses
        xtensa: nommu: fix USER_RING definition
        xtensa: xtfpga: fix integer overflow in TASK_SIZE
        xtensa: fix build for configs without cache options
        xtensa: fixes for configs without loop option
      3510ca19
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu · e4da7e9a
      Linus Torvalds authored
      Pull m68knommu/coldfire fix from Greg Ungerer:
       "Only a single patch, fixes brk area setup problem in nommu
        environments"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu:
        fs/binfmt_elf_fdpic.c: fix brk area overlap with stack on NOMMU
      e4da7e9a
  3. 09 Nov, 2015 8 commits