1. 19 Feb, 2014 11 commits
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.14-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · e95003c3
      Linus Torvalds authored
      Pull NFS client bugfixes from Trond Myklebust:
       "Highlights include stable fixes for the following bugs:
      
         - General performance regression due to NFS_INO_INVALID_LABEL being
           set when the server doesn't support labeled NFS
         - Hang in the RPC code due to a socket out-of-buffer race
         - Infinite loop when trying to establish the NFSv4 lease
         - Use-after-free bug in the RPCSEC gss code.
         - nfs4_select_rw_stateid is returning with a non-zero error value on
           success
      
        Other bug fixes:
      
        - Potential memory scribble in the RPC bi-directional RPC code
        - Pipe version reference leak
        - Use the correct net namespace in the new NFSv4 migration code"
      
      * tag 'nfs-for-3.14-4' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        NFS fix error return in nfs4_select_rw_stateid
        NFSv4: Use the correct net namespace in nfs4_update_server
        SUNRPC: Fix a pipe_version reference leak
        SUNRPC: Ensure that gss_auth isn't freed before its upcall messages
        SUNRPC: Fix potential memory scribble in xprt_free_bc_request()
        SUNRPC: Fix races in xs_nospace()
        SUNRPC: Don't create a gss auth cache unless rpc.gssd is running
        NFS: Do not set NFS_INO_INVALID_LABEL unless server supports labeled NFS
      e95003c3
    • Linus Torvalds's avatar
      Merge tag 'mfd-fixes-3.14-1' of git://git.linaro.org/people/lee.jones/mfd · 981adacd
      Linus Torvalds authored
      Pull MFD fixes from Lee Jones:
       "Couple of small issues solved:
         - Suspend/Resume call-backs require CONFIG_PM_SLEEP
         - Some drivers written for 32bit architectures fail when compiled
           with a 64bit compiler.  The fixes will future proof the drivers"
      
      * tag 'mfd-fixes-3.14-1' of git://git.linaro.org/people/lee.jones/mfd:
        mfd: sec-core: sec_pmic_{suspend,resume}() should depend on CONFIG_PM_SLEEP
        mfd: max14577: max14577_{suspend,resume}() should depend on CONFIG_PM_SLEEP
        mfd: tps65217: Naturalise cross-architecture discrepancies
        mfd: wm8994-core: Naturalise cross-architecture discrepancies
        mfd: max8998: Naturalise cross-architecture discrepancies
        mfd: max8997: Naturalise cross-architecture discrepancies
      981adacd
    • Andy Adamson's avatar
      NFS fix error return in nfs4_select_rw_stateid · 146d70ca
      Andy Adamson authored
      Do not return an error when nfs4_copy_delegation_stateid succeeds.
      Signed-off-by: default avatarAndy Adamson <andros@netapp.com>
      Link: http://lkml.kernel.org/r/1392737765-41942-1-git-send-email-andros@netapp.com
      Fixes: ef1820f9 (NFSv4: Don't try to recover NFSv4 locks when...)
      Cc: NeilBrown <neilb@suse.de>
      Cc: stable@vger.kernel.org # 3.12+
      Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
      146d70ca
    • Geert Uytterhoeven's avatar
      mfd: sec-core: sec_pmic_{suspend,resume}() should depend on CONFIG_PM_SLEEP · 8321bbf8
      Geert Uytterhoeven authored
      If CONFIG_PM_SLEEP=n:
      
      drivers/mfd/sec-core.c:349: warning: ‘sec_pmic_suspend’ defined but not used
      drivers/mfd/sec-core.c:371: warning: ‘sec_pmic_resume’ defined but not used
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      8321bbf8
    • Geert Uytterhoeven's avatar
      mfd: max14577: max14577_{suspend,resume}() should depend on CONFIG_PM_SLEEP · 3edeb1e4
      Geert Uytterhoeven authored
      If CONFIG_PM_SLEEP=n:
      
      drivers/mfd/max14577.c:177: warning: ‘max14577_suspend’ defined but not used
      drivers/mfd/max14577.c:200: warning: ‘max14577_resume’ defined but not used
      Signed-off-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      3edeb1e4
    • Lee Jones's avatar
      mfd: tps65217: Naturalise cross-architecture discrepancies · 5c6fbd56
      Lee Jones authored
      If we compile the TPS65217 for a 64bit architecture we receive the following
      warnings:
      
      drivers/mfd/tps65217.c: In function ‘tps65217_probe’:
      drivers/mfd/tps65217.c:173:13:
        warning: cast from pointer to integer of different size
         chip_id = (unsigned int)match->data;
                   ^
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      5c6fbd56
    • Lee Jones's avatar
      mfd: wm8994-core: Naturalise cross-architecture discrepancies · 7f8279ce
      Lee Jones authored
      If we compile the WM8994 for a 64bit architecture we receive the following
      warnings:
      
      drivers/mfd/wm8994-core.c: In function ‘wm8994_i2c_probe’:
      drivers/mfd/wm8994-core.c:639:19:
        warning: cast from pointer to integer of different size
          wm8994->type = (int)of_id->data;
                         ^
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      7f8279ce
    • Lee Jones's avatar
      mfd: max8998: Naturalise cross-architecture discrepancies · 8bace2d5
      Lee Jones authored
      If we compile the MAX8998 for a 64bit architecture we receive the following
      warnings:
      
        drivers/mfd/max8998.c: In function ‘max8998_i2c_get_driver_data’:
        drivers/mfd/max8998.c:178:10:
          warning: cast from pointer to integer of different size
           return (int)match->data;
                  ^
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      8bace2d5
    • Lee Jones's avatar
      mfd: max8997: Naturalise cross-architecture discrepancies · 05fb7a56
      Lee Jones authored
      If we compile the MAX8997 for a 64bit architecture we receive the following
      warnings:
      
        drivers/mfd/max8997.c: In function ‘max8997_i2c_get_driver_data’:
        drivers/mfd/max8997.c:173:10:
          warning: cast from pointer to integer of different size
           return (int)match->data;
                  ^
      Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
      05fb7a56
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · 960dfc4e
      Linus Torvalds authored
      Pull drm fixes from Dave Airlie:
       "Lots of little small things, nothing too major: nouveau regression
        fixes, vmware fixes for the new hw support, memory leaks in error path
        fixes"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: (31 commits)
        drm/radeon/ni: fix typo in dpm sq ramping setup
        drm/radeon/si: fix typo in dpm sq ramping setup
        drm/radeon: fix CP semaphores on CIK
        drm/radeon: delete a stray tab
        drm/radeon: fix display tiling setup on SI
        drm/radeon/dpm: reduce r7xx vblank mclk threshold to 200
        drm/radeon: fill in DRM_CAPs for cursor size
        drm: add DRM_CAPs for cursor size
        drm/radeon: unify bpc handling
        drm/ttm: Fix memory leak in ttm_agp_backend.c
        drm/ttm: declare 'struct device' in ttm_page_alloc.h
        drm/nouveau: fix TTM_PL_TT memtype on pre-nv50
        drm/nv50/disp: use correct register to determine DP display bpp
        drm/nouveau/fb: use correct ram oclass for nv1a hardware
        drm/nv50/gr: add missing nv_error parameter priv
        drm/nouveau: fix ENG_RUNLIST register address
        drm/nv4c/bios: disallow retrieving from prom on nv4x igp's
        drm/nv4c/vga: decode register is in a different place on nv4x igp's
        drm/nv4c/mc: nv4x igp's have a different msi rearm register
        drm/nouveau: set irq_enabled manually
        ...
      960dfc4e
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · 525b8709
      Linus Torvalds authored
      Pull HID update from Jiri Kosina:
      
       - fixes for several bugs in incorrect allocations of buffers by David
         Herrmann and Benjamin Tissoires.
      
       - support for a few new device IDs by Archana Patni, Benjamin
         Tissoires, Huei-Horng Yo, Reyad Attiyat and Yufeng Shen
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: hyperv: make sure input buffer is big enough
        HID: Bluetooth: hidp: make sure input buffers are big enough
        HID: hid-sensor-hub: quirk for STM Sensor hub
        HID: apple: add Apple wireless keyboard 2011 JIS model support
        HID: fix buffer allocations
        HID: multitouch: add FocalTech FTxxxx support
        HID: microsoft: Add ID's for Surface Type/Touch Cover 2
        HID: usbhid: quirk for CY-TM75 75 inch Touch Overlay
      525b8709
  2. 18 Feb, 2014 29 commits