1. 13 Jul, 2013 6 commits
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · d1447464
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "MIPS updates:
      
         - All the things that didn't make 3.10.
         - Removes the Windriver PPMC platform.  Nobody will miss it.
         - Remove a workaround from kernel/irq/irqdomain.c which was there
           exclusivly for MIPS.  Patch by Grant Likely.
         - More small improvments for the SEAD 3 platform
         - Improvments on the BMIPS / SMP support for the BCM63xx series.
         - Various cleanups of dead leftovers.
         - Platform support for the Cavium Octeon-based EdgeRouter Lite.
      
        Two large KVM patchsets didn't make it for this pull request because
        their respective authors are vacationing"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (124 commits)
        MIPS: Kconfig: Add missing MODULES dependency to VPE_LOADER
        MIPS: BCM63xx: CLK: Add dummy clk_{set,round}_rate() functions
        MIPS: SEAD3: Disable L2 cache on SEAD-3.
        MIPS: BCM63xx: Enable second core SMP on BCM6328 if available
        MIPS: BCM63xx: Add SMP support to prom.c
        MIPS: define write{b,w,l,q}_relaxed
        MIPS: Expose missing pci_io{map,unmap} declarations
        MIPS: Malta: Update GCMP detection.
        Revert "MIPS: make CAC_ADDR and UNCAC_ADDR account for PHYS_OFFSET"
        MIPS: APSP: Remove <asm/kspd.h>
        SSB: Kconfig: Amend SSB_EMBEDDED dependencies
        MIPS: microMIPS: Fix improper definition of ISA exception bit.
        MIPS: Don't try to decode microMIPS branch instructions where they cannot exist.
        MIPS: Declare emulate_load_store_microMIPS as a static function.
        MIPS: Fix typos and cleanup comment
        MIPS: Cleanup indentation and whitespace
        MIPS: BMIPS: support booting from physical CPU other than 0
        MIPS: Only set cpu_has_mmips if SYS_SUPPORTS_MICROMIPS
        MIPS: GIC: Fix gic_set_affinity infinite loop
        MIPS: Don't save/restore OCTEON wide multiplier state on syscalls.
        ...
      d1447464
    • Linus Torvalds's avatar
      Merge git://www.linux-watchdog.org/linux-watchdog · 833e6834
      Linus Torvalds authored
      Pull watchdog updates from Wim Van Sebroeck:
       - lots of devm_ conversions and cleanup
       - platform_set_drvdata cleanups
       - s3c2410: dev_err/dev_info + dev_pm_ops
       - watchdog_core: don't try to stop device if not running fix
       - wdrtas: use print_hex_dump
       - xilinx cleanups
       - orion_wdt fixes
       - softdog cleanup
       - hpwdt: check on UEFI bits
       - deletion of mpcore_wdt driver
       - addition of broadcom BCM2835 watchdog timer driver
       - addition of MEN A21 watcdog devices
      
      * git://www.linux-watchdog.org/linux-watchdog: (38 commits)
        watchdog: hpwdt: Add check for UEFI bits
        watchdog: softdog: remove replaceable ping operation
        watchdog: New watchdog driver for MEN A21 watchdogs
        Watchdog: fix clearing of the watchdog interrupt
        Watchdog: allow orion_wdt to be built for Dove
        watchdog: Add Broadcom BCM2835 watchdog timer driver
        watchdog: delete mpcore_wdt driver
        watchdog: xilinx: Setup the origin compatible string
        watchdog: xilinx: Fix driver header
        watchdog: wdrtas: don't use custom version of print_hex_dump
        watchdog: core: don't try to stop device if not running
        watchdog: jz4740: Pass device to clk_get
        watchdog: twl4030: Remove redundant platform_set_drvdata()
        watchdog: mpcore: Remove redundant platform_set_drvdata()
        watchdog: da9055: use platform_{get,set}_drvdata()
        watchdog: da9052: use platform_{get,set}_drvdata()
        watchdog: cpwd: use platform_{get,set}_drvdata()
        watchdog: s3c2410_wdt: convert s3c2410wdt to dev_pm_ops
        watchdog: s3c2410_wdt: use dev_err()/dev_info() instead of pr_err()/pr_info()
        watchdog: wm831x: use platform_{get,set}_drvdata()
        ...
      833e6834
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · c5524413
      Linus Torvalds authored
      Pull InfiniBand/RDMA changes from Roland Dreier:
       - AF_IB (native IB addressing) for CMA from Sean Hefty
       - new mlx5 driver for Mellanox Connect-IB adapters (including post
         merge request fixes)
       - SRP fixes from Bart Van Assche (including fix to first merge request)
       - qib HW driver updates
       - resurrection of ocrdma HW driver development
       - uverbs conversion to create fds with O_CLOEXEC set
       - other small changes and fixes
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: (66 commits)
        mlx5: Return -EFAULT instead of -EPERM
        IB/qib: Log all SDMA errors unconditionally
        IB/qib: Fix module-level leak
        mlx5_core: Adjust hca_cap.uar_page_sz to conform to Connect-IB spec
        IB/srp: Let srp_abort() return FAST_IO_FAIL if TL offline
        IB/uverbs: Use get_unused_fd_flags(O_CLOEXEC) instead of get_unused_fd()
        mlx5_core: Fixes for sparse warnings
        IB/mlx5: Make profile[] static in main.c
        mlx5: Fix parameter type of health_handler_t
        mlx5: Add driver for Mellanox Connect-IB adapters
        IB/core: Add reserved values to enums for low-level driver use
        IB/srp: Bump driver version and release date
        IB/srp: Make HCA completion vector configurable
        IB/srp: Maintain a single connection per I_T nexus
        IB/srp: Fail I/O fast if target offline
        IB/srp: Skip host settle delay
        IB/srp: Avoid skipping srp_reset_host() after a transport error
        IB/srp: Fix remove_one crash due to resource exhaustion
        IB/qib: New transmitter tunning settings for Dell 1.1 backplane
        IB/core: Fix error return code in add_port()
        ...
      c5524413
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 85865511
      Linus Torvalds authored
      Pull media updates from Mauro Carvalho Chehab:
       "This series contain:
         - new i2c video drivers: ml86v7667 (video decoder),
                                  ths8200 (video encoder)
         - a new video driver for EasyCap cards based on Fushicai USBTV007
         - Improved support for OF and embedded systems, with V4L2 async
           initialization and a better support for clocks
         - API cleanups on the ioctls used by the v4l2 debug tool
         - Lots of cleanups
         - As usual, several driver improvements and new cards additions
         - Revert two changesets that change the minimal symbol rate for
           stv0399, as request by Manu
         - Update MAINTAINERS and other files to point to my new e-mail"
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (378 commits)
        MAINTAINERS & ABI: Update to point to my new email
        [media] stb0899: restore minimal rate to 5Mbauds
        [media] exynos4-is: Correct colorspace handling at FIMC-LITE
        [media] exynos4-is: Set valid initial format on FIMC.n subdevs
        [media] exynos4-is: Set valid initial format on FIMC-IS-ISP subdev pads
        [media] exynos4-is: Fix format propagation on FIMC-IS-ISP subdev
        [media] exynos4-is: Set valid initial format at FIMC-LITE
        [media] exynos4-is: Fix format propagation on FIMC-LITE.n subdevs
        [media] MAINTAINERS: Update S5P/Exynos FIMC driver entry
        [media] Documentation: Update driver's directory in video4linux/fimc.txt
        [media] exynos4-is: Change fimc-is firmware file names
        [media] exynos4-is: Add support for Exynos5250 MIPI-CSIS
        [media] exynos4-is: Add Exynos5250 SoC support to fimc-lite driver
        [media] exynos4-is: Drop drvdata handling in fimc-lite for non-dt platforms
        [media] media: i2c: tvp514x: remove manual setting of subdev name
        [media] media: i2c: tvp7002: remove manual setting of subdev name
        [media] mem2mem: set missing v4l2_dev pointer
        [media] wl128x: add missing struct v4l2_device
        [media] tvp514x: Fix init seqeunce
        [media] saa7134: Fix sparse warnings by adding __user annotation
        ...
      85865511
    • Linus Torvalds's avatar
      Merge tag 'for-linus-v3.11-rc1-2' of git://oss.sgi.com/xfs/xfs · 239dab46
      Linus Torvalds authored
      Pull more xfs updates from Ben Myers:
       "Here are a fix for xfs_fsr, a cleanup in bulkstat, a cleanup in
        xfs_open_by_handle, updated mount options documentation, a cleanup in
        xfs_bmapi_write, a fix for the size of dquot log reservations, a fix
        for sgid inheritance when acls are in use, a fix for cleaning up
        quotainfo structures, and some more of the work which allows group and
        project quotas to be used together.
      
        We had a few more in this last quota category that we might have liked
        to get in, but it looks there are still a few items that need to be
        addressed.
      
         - fix for xfs_fsr returning -EINVAL
         - cleanup in xfs_bulkstat
         - cleanup in xfs_open_by_handle
         - update mount options documentation
         - clean up local format handling in xfs_bmapi_write
         - fix dquot log reservations which were too small
         - fix sgid inheritance for subdirectories when default acls are in use
         - add project quota fields to various structures
         - fix teardown of quotainfo structures when quotas are turned off"
      
      * tag 'for-linus-v3.11-rc1-2' of git://oss.sgi.com/xfs/xfs:
        xfs: Fix the logic check for all quotas being turned off
        xfs: Add pquota fields where gquota is used.
        xfs: fix sgid inheritance for subdirectories inheriting default acls [V3]
        xfs: dquot log reservations are too small
        xfs: remove local fork format handling from xfs_bmapi_write()
        xfs: update mount options documentation
        xfs: use get_unused_fd_flags(0) instead of get_unused_fd()
        xfs: clean up unused codes at xfs_bulkstat()
        xfs: use XFS_BMAP_BMDR_SPACE vs. XFS_BROOT_SIZE_ADJ
      239dab46
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · f1c41088
      Linus Torvalds authored
      Pull cifs fixes from Steve French:
       "Fixes for 4 cifs bugs, including a reconnect problem, a problem
        parsing responses to SMB2 open request, and setting nlink incorrectly
        to some servers which don't report it properly on the wire.  Also
        improves data integrity on reconnect with series from Pavel which adds
        durable handle support for SMB2."
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        CIFS: Fix a deadlock when a file is reopened
        CIFS: Reopen the file if reconnect durable handle failed
        [CIFS] Fix minor endian error in durable handle patch series
        CIFS: Reconnect durable handles for SMB2
        CIFS: Make SMB2_open use cifs_open_parms struct
        CIFS: Introduce cifs_open_parms struct
        CIFS: Request durable open for SMB2 opens
        CIFS: Simplify SMB2 create context handling
        CIFS: Simplify SMB2_open code path
        CIFS: Respect create_options in smb2_open_file
        CIFS: Fix lease context buffer parsing
        [CIFS] use sensible file nlink values if unprovided
        Limit allocation of crypto mechanisms to dialect which requires
      f1c41088
  2. 12 Jul, 2013 1 commit
  3. 11 Jul, 2013 33 commits
    • Roland Dreier's avatar
      e04abfa2
    • Dan Carpenter's avatar
      mlx5: Return -EFAULT instead of -EPERM · 5e631a03
      Dan Carpenter authored
      For copy_to/from_user() failure, the correct error code is -EFAULT not
      -EPERM.
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      5e631a03
    • Dean Luick's avatar
      IB/qib: Log all SDMA errors unconditionally · 0b3ddf38
      Dean Luick authored
      This patch adds code to log SDMA errors for supportability purposes.
      Signed-off-by: default avatarDean Luick <dean.luick@intel.com>
      Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      0b3ddf38
    • Mike Marciniszyn's avatar
      IB/qib: Fix module-level leak · 308c813b
      Mike Marciniszyn authored
      The vzalloc()'ed field physshadow is leaked on module unload.
      
      This patch adds vfree after the sibling page shadow is freed.
      Reported-by: default avatarDean Luick <dean.luick@intel.com>
      Reviewed-by: default avatarDean Luick <dean.luick@intel.com>
      Signed-off-by: default avatarMike Marciniszyn <mike.marciniszyn@intel.com>
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      308c813b
    • Moshe Lazer's avatar
      mlx5_core: Adjust hca_cap.uar_page_sz to conform to Connect-IB spec · 288dde9f
      Moshe Lazer authored
      Sparse reported an endianness bug in the assignment to hca_cap.uar_page_sz.
      
      Fix the declaration of this field to be __be16 (which is what is in
      the firmware spec), renaming the field to log_uar_pg_size to conform
      to the spec, which fixes the endianness bug reported by sparse.
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarMoshe Lazer <moshel@mellanox.com>
      Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      288dde9f
    • Bart Van Assche's avatar
      IB/srp: Let srp_abort() return FAST_IO_FAIL if TL offline · 80d5e8a2
      Bart Van Assche authored
      If the transport layer is offline it is more appropriate to let
      srp_abort() return FAST_IO_FAIL instead of SUCCESS.
      Reported-by: default avatarSebastian Riemer <sebastian.riemer@profitbricks.com>
      Acked-by: default avatarDavid Dillow <dillowda@ornl.gov>
      Signed-off-by: default avatarBart Van Assche <bvanassche@acm.org>
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      80d5e8a2
    • Pavel Shilovsky's avatar
      CIFS: Fix a deadlock when a file is reopened · 689c3db4
      Pavel Shilovsky authored
      If we request reading or writing on a file that needs to be
      reopened, it causes the deadlock: we are already holding rw
      semaphore for reading and then we try to acquire it for writing
      in cifs_relock_file. Fix this by acquiring the semaphore for
      reading in cifs_relock_file due to we don't make any changes in
      locks and don't need a write access.
      
      CC: <stable@vger.kernel.org>
      Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
      Acked-by: default avatarJeff Layton <jlayton@redhat.com>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
      689c3db4
    • Pavel Shilovsky's avatar
      CIFS: Reopen the file if reconnect durable handle failed · b33fcf1c
      Pavel Shilovsky authored
      This is a follow-on patch for 8/8 patch from the durable handles
      series. It fixes the problem when durable file handle timeout
      expired on the server and reopen returns -ENOENT for such files.
      Signed-off-by: default avatarPavel Shilovsky <pshilovsky@samba.org>
      Signed-off-by: default avatarSteve French <smfrench@gmail.com>
      b33fcf1c
    • Chandra Seetharaman's avatar
      xfs: Fix the logic check for all quotas being turned off · c31ad439
      Chandra Seetharaman authored
      During the review of seperate pquota inode patches, David noticed
      that the test to detect all quotas being turned off was
      incorrect, and hence the block was not freeing all the quota
      information.
      
      The check made sense in Irix, but in Linux, quota is turned off
      one at a time, which makes the test invalid for Linux.
      
      This problem existed since XFS was ported to Linux.
      
      David suggested to fix the problem by detecting when all quotas are
      turned off by checking m_qflags.
      Signed-off-by: default avatarChandra Seetharaman <sekharan@us.ibm.com>
      Reviewed-by: default avatarBen Myers <bpm@sgi.com>
      Signed-off-by: default avatarBen Myers <bpm@sgi.com>
      c31ad439
    • Mingarelli, Thomas's avatar
      watchdog: hpwdt: Add check for UEFI bits · cce78da7
      Mingarelli, Thomas authored
      This patch is being created to use the UEFI bits in the type 219 SMBIOS
      record in order to decide whether or not to execute BIOS code. This is a
      better solution than to depend on the iCRU bit since not all future servers
      will use iCRU.
      Signed-off-by: default avatarThomas Mingarelli <thomas.mingarelli@hp.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      ----
      drivers/watchdog/hpwdt.c |    9 ++++++---
       1 files changed, 6 insertions(+), 3 deletions(-)
      cce78da7
    • Kim, Milo's avatar
      watchdog: softdog: remove replaceable ping operation · 086f3ec1
      Kim, Milo authored
      In watchdog_ping(), 'start' is called automatically when 'ping' function call
      is not configured.
      Softdog driver has same handling in both cases - start and ping, so 'ping' OPS
      can be removed.
      Signed-off-by: default avatarMilo(Woogyom) Kim <milo.kim@ti.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      086f3ec1
    • Johannes Thumshirn's avatar
      watchdog: New watchdog driver for MEN A21 watchdogs · 26c57ef1
      Johannes Thumshirn authored
      This patch adds the driver for the watchdog devices found on MEN Mikro
      Elektronik A21 VMEbus CPU Carrier Boards. It has DT-support and uses the
      watchdog framework.
      Signed-off-by: default avatarJohannes Thumshirn <johannes.thumshirn@men.de>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      26c57ef1
    • Russell King's avatar
      Watchdog: fix clearing of the watchdog interrupt · 6910ceb5
      Russell King authored
      The bits in BRIDGE_CAUSE are documented as RW0C - read, write 0 to
      clear.  If we read the register, mask off the watchdog bit, and
      write it back, we're actually clearing every interrupt which wasn't
      pending at the time we read the register - and that is racy.
      
      Fix this to only write ~WATCHDOG_BIT to the register, which means
      we write as zero only the watchdog bit.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
      Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      6910ceb5
    • Russell King's avatar
      Watchdog: allow orion_wdt to be built for Dove · fa142ff5
      Russell King authored
      The watchdog infrastructure in Dove is no different from that in
      Orion5x or Kirkwood, so let's enable it for Dove.  The only things
      missing are a few register settings in Dove's bridge-regs.h.
      
      Rather than duplicating the same register bit masks for the RSTOUTn_MASK
      and BRIDGE_CAUSE registers, move the definitions into the watchdog
      driver itself.
      Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
      Acked-by: default avatarJason Cooper <jason@lakedaemon.net>
      Tested-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      fa142ff5
    • Lubomir Rintel's avatar
      watchdog: Add Broadcom BCM2835 watchdog timer driver · 938d0a84
      Lubomir Rintel authored
      This adds a driver for watchdog timer hardware present on Broadcom BCM2835 SoC,
      used in Raspberry Pi and Roku 2 devices.
      Signed-off-by: default avatarLubomir Rintel <lkundrak@v3.sk>
      Tested-by: default avatarStephen Warren <swarren@wwwdotorg.org>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      Cc: linux-rpi-kernel@lists.infradead.org
      Cc: linux-watchdog@vger.kernel.org
      Cc: devicetree-discuss@lists.ozlabs.org
      938d0a84
    • Linus Torvalds's avatar
      Merge tag 'dm-3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm · 9903883f
      Linus Torvalds authored
      Pull device-mapper changes from Alasdair G Kergon:
       "Add a device-mapper target called dm-switch to provide a multipath
        framework for storage arrays that dynamically reconfigure their
        preferred paths for different device regions.
      
        Fix a bug in the verity target that prevented its use with some
        specific sizes of devices.
      
        Improve some locking mechanisms in the device-mapper core and bufio.
      
        Add Mike Snitzer as a device-mapper maintainer.
      
        A few more clean-ups and fixes"
      
      * tag 'dm-3.11-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-dm:
        dm: add switch target
        dm: update maintainers
        dm: optimize reorder structure
        dm: optimize use SRCU and RCU
        dm bufio: submit writes outside lock
        dm cache: fix arm link errors with inline
        dm verity: use __ffs and __fls
        dm flakey: correct ctr alloc failure mesg
        dm verity: remove pointless comparison
        dm: use __GFP_HIGHMEM in __vmalloc
        dm verity: fix inability to use a few specific devices sizes
        dm ioctl: set noio flag to avoid __vmalloc deadlock
        dm mpath: fix ioctl deadlock when no paths
      9903883f
    • Linus Torvalds's avatar
      Merge branch 'for-3.11/core' of git://git.kernel.dk/linux-block · 36805aae
      Linus Torvalds authored
      Pull core block IO updates from Jens Axboe:
       "Here are the core IO block bits for 3.11. It contains:
      
         - A tweak to the reserved tag logic from Jan, for weirdo devices with
           just 3 free tags.  But for those it improves things substantially
           for random writes.
      
         - Periodic writeback fix from Jan.  Marked for stable as well.
      
         - Fix for a race condition in IO scheduler switching from Jianpeng.
      
         - The hierarchical blk-cgroup support from Tejun.  This is the grunt
           of the series.
      
         - blk-throttle fix from Vivek.
      
        Just a note that I'm in the middle of a relocation, whole family is
        flying out tomorrow.  Hence I will be awal the remainder of this week,
        but back at work again on Monday the 15th.  CC'ing Tejun, since any
        potential "surprises" will most likely be from the blk-cgroup work.
        But it's been brewing for a while and sitting in my tree and
        linux-next for a long time, so should be solid."
      
      * 'for-3.11/core' of git://git.kernel.dk/linux-block: (36 commits)
        elevator: Fix a race in elevator switching
        block: Reserve only one queue tag for sync IO if only 3 tags are available
        writeback: Fix periodic writeback after fs mount
        blk-throttle: implement proper hierarchy support
        blk-throttle: implement throtl_grp->has_rules[]
        blk-throttle: Account for child group's start time in parent while bio climbs up
        blk-throttle: add throtl_qnode for dispatch fairness
        blk-throttle: make throtl_pending_timer_fn() ready for hierarchy
        blk-throttle: make tg_dispatch_one_bio() ready for hierarchy
        blk-throttle: make blk_throtl_bio() ready for hierarchy
        blk-throttle: make blk_throtl_drain() ready for hierarchy
        blk-throttle: dispatch from throtl_pending_timer_fn()
        blk-throttle: implement dispatch looping
        blk-throttle: separate out throtl_service_queue->pending_timer from throtl_data->dispatch_work
        blk-throttle: set REQ_THROTTLED from throtl_charge_bio() and gate stats update with it
        blk-throttle: implement sq_to_tg(), sq_to_td() and throtl_log()
        blk-throttle: add throtl_service_queue->parent_sq
        blk-throttle: generalize update_disptime optimization in blk_throtl_bio()
        blk-throttle: dispatch to throtl_data->service_queue.bio_lists[]
        blk-throttle: move bio_lists[] and friends to throtl_service_queue
        ...
      36805aae
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 6d2fa9e1
      Linus Torvalds authored
      Pull SCSI target updates from Nicholas Bellinger:
       "Lots of activity this round on performance improvements in target-core
        while benchmarking the prototype scsi-mq initiator code with
        vhost-scsi fabric ports, along with a number of iscsi/iser-target
        improvements and hardening fixes for exception path cases post v3.10
        merge.
      
        The highlights include:
      
         - Make persistent reservations APTPL buffer allocated on-demand, and
           drop per t10_reservation buffer.  (grover)
         - Make virtual LUN=0 a NULLIO device, and skip allocation of NULLIO
           device pages (grover)
         - Add transport_cmd_check_stop write_pending bit to avoid extra
           access of ->t_state_lock is WRITE I/O submission fast-path.  (nab)
         - Drop unnecessary CMD_T_DEV_ACTIVE check from
           transport_lun_remove_cmd to avoid extra access of ->t_state_lock in
           release fast-path.  (nab)
         - Avoid extra t_state_lock access in __target_execute_cmd fast-path
           (nab)
         - Drop unnecessary vhost-scsi wait_for_tasks=true usage +
           ->t_state_lock access in release fast-path.  (nab)
         - Convert vhost-scsi to use modern se_cmd->cmd_kref
           TARGET_SCF_ACK_KREF usage (nab)
         - Add tracepoints for SCSI commands being processed (roland)
         - Refactoring of iscsi-target handling of ISCSI_OP_NOOP +
           ISCSI_OP_TEXT to be transport independent (nab)
         - Add iscsi-target SendTargets=$IQN support for in-band discovery
           (nab)
         - Add iser-target support for in-band discovery (nab + Or)
         - Add iscsi-target demo-mode TPG authentication context support (nab)
         - Fix isert_put_reject payload buffer post (nab)
         - Fix iscsit_add_reject* usage for iser (nab)
         - Fix iscsit_sequence_cmd reject handling for iser (nab)
         - Fix ISCSI_OP_SCSI_TMFUNC handling for iser (nab)
         - Fix session reset bug with RDMA_CM_EVENT_DISCONNECTED (nab)
      
        The last five iscsi/iser-target items are CC'ed to stable, as they do
        address issues present in v3.10 code.  They are certainly larger than
        I'd like for stable patch set, but are important to ensure proper
        REJECT exception handling in iser-target for 3.10.y"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (51 commits)
        iser-target: Ignore non TEXT + LOGOUT opcodes for discovery
        target: make queue_tm_rsp() return void
        target: remove unused codes from enum tcm_tmrsp_table
        iscsi-target: kstrtou* configfs attribute parameter cleanups
        iscsi-target: Fix tfc_tpg_auth_cit configfs length overflow
        iscsi-target: Fix tfc_tpg_nacl_auth_cit configfs length overflow
        iser-target: Add support for ISCSI_OP_TEXT opcode + payload handling
        iser-target: Rename sense_buf_[dma,len] to pdu_[dma,len]
        iser-target: Add vendor_err debug output
        target: Add (obsolete) checking for PMI/LBA fields in READ CAPACITY(10)
        target: Return correct sense data for IO past the end of a device
        target: Add tracepoints for SCSI commands being processed
        iser-target: Fix session reset bug with RDMA_CM_EVENT_DISCONNECTED
        iscsi-target: Fix ISCSI_OP_SCSI_TMFUNC handling for iser
        iscsi-target: Fix iscsit_sequence_cmd reject handling for iser
        iscsi-target: Fix iscsit_add_reject* usage for iser
        iser-target: Fix isert_put_reject payload buffer post
        iscsi-target: missing kfree() on error path
        iscsi-target: Drop left-over iscsi_conn->bad_hdr
        target: Make core_scsi3_update_and_write_aptpl return sense_reason_t
        ...
      6d2fa9e1
    • Viresh Kumar's avatar
      watchdog: delete mpcore_wdt driver · 6e63a3a2
      Viresh Kumar authored
      Interrupt request doesn't use the right API: The TWD watchdog uses a per-cpu
      interrupt (usually interrupt #30), and the GIC configuration should flag it as
      such. With this setup, request_irq() should fail, and the right API is
      request_percpu_irq(), together with enable_percpu_irq()/disable_percpu_irq().
      
      Nothing ensures the userspace ioctl() will end-up kicking the watchdog on the
      right CPU.
      
      There are no users of this driver since a long time and it makes more sense to
      get rid of it as nobody is looking to fix it.
      
      In case somebody wakes up after this has been removed and needs it, please
      revert this driver and pick these updates (These were never pushed to mainline):
      
      http://comments.gmane.org/gmane.linux.ports.arm.kernel/245998Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
      Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      6e63a3a2
    • Michal Simek's avatar
      watchdog: xilinx: Setup the origin compatible string · 8fce9b36
      Michal Simek authored
      Watchdog 1.01.a is also compatible with 1.00.a.
      Add the origin version to compatible list.
      Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      8fce9b36
    • Linus Torvalds's avatar
      Merge tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 0fb3767b
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "A few small fixes (and cleanups) for HD-audio, USB-audio and ASoC"
      
      * tag 'sound-3.11' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: usb-audio: fix regression for fixed stream quirk
        ALSA: hda - Keep halting ALC5505 DSP
        ASoC: wm8962: fix NULL pdata pointer
        ASoC: imx-sgtl5000: return E_PROBE_DEFER if ssi/codec not found
        ASoC: Samsung: Remove redundant comment
        ALSA: hda - Fix EAPD vmaster hook for AD1884 & co
        ASoC: samsung: Remove obsolete GPIO based DT pinmuxing
        ASoC: mxs: register saif mclk to clock framework
      0fb3767b
    • Linus Torvalds's avatar
      Merge tag 'remoteproc-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc · 0edcd16a
      Linus Torvalds authored
      Pull remoteproc fixes from Ohad Ben-Cohen:
       "Trivial remoteproc fixes by Suman Anna, Wei Yongjun and Thomas Meyer"
      
      * tag 'remoteproc-3.11-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ohad/remoteproc:
        remoteproc: Cocci spatch "memdup.spatch"
        remoteproc: free carveout memories only after unmapping them
        remoteproc/omap: fix a sparse warning
        remoteproc: fix checkpatch errors in remoteproc code
        remoteproc: fix error return code in rproc_fw_boot()
      0edcd16a
    • Linus Torvalds's avatar
      Merge tag 'xtensa-next-20130710' of git://github.com/czankel/xtensa-linux · d4d1cda6
      Linus Torvalds authored
      Pull Xtensa updates from Chris Zankel.
      
      * tag 'xtensa-next-20130710' of git://github.com/czankel/xtensa-linux: (22 commits)
        xtensa: remove the second argument of __bio_kmap_atomic()
        xtensa: add static function tracer support
        xtensa: Flat DeviceTree copy not future-safe
        xtensa: check TLB sanity on return to userspace
        xtensa: adjust boot parameters address when INITIALIZE_XTENSA_MMU_INSIDE_VMLINUX is selected
        xtensa: bootparams: fix typo
        xtensa: tell git to ignore generated .dtb files
        xtensa: ccount based sched_clock
        xtensa: ccount based clockevent implementation
        xtensa: consolidate ccount access routines
        xtensa: cleanup ccount frequency tracking
        xtensa: timex.h: remove unused symbols
        xtensa: tell git to ignore copied zlib source files
        xtensa: fix section mismatch in pcibios_fixup_bus
        xtensa: ISS: fix section mismatch in iss_net_setup
        arch: xtensa: include: asm: compiling issue, need cmpxchg64() defined.
        xtensa: xtfpga: fix section mismatch
        xtensa: remove unused platform_init_irq()
        xtensa: tell git to ignore generated files
        xtensa: flush TLB entries for pages of non-current mm correctly
        ...
      d4d1cda6
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.11-rc1-more' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7728f036
      Linus Torvalds authored
      Pull more power management and ACPI updates from Rafael Wysocki:
      
       - Fix for a recent cpufreq regression that caused WARN() to trigger
         overzealously in a couple of places and spam the kernel log with
         useless garbage as a result.  From Viresh Kumar.
      
       - ACPI dock fix removing a discrepancy between the definition of
         acpi_dock_init(), which says that the function returns int, and its
         header in the header file, which says that it is a void function.
         The function is now defined as void too.
      
       - ACPI PM fix for failures to update device power states as needed, for
         example, during resume from system suspend, because the old state was
         deeper than the new one, but the new one is not D0.
      
       - Fix for two debug messages in the ACPI power resources code that
         don't have a newline at the end and make the kernel log difficult to
         read.  From Mika Westerberg.
      
       - Two ACPI cleanups from Naresh Bhat and Haicheng Li.
      
       - cpupower updates from Thomas Renninger, including Intel Haswell
         support improvements and a new idle-set subcommand among other
         things.
      
      * tag 'pm+acpi-3.11-rc1-more' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / power: add missing newline to debug messages
        cpupower: Add Haswell family 0x45 specific idle monitor to show PC8,9,10 states
        cpupower: Haswell also supports the C-states introduced with SandyBridge
        cpupower: Introduce idle-set subcommand and C-state enabling/disabling
        cpupower: Implement disabling of cstate interface
        cpupower: Make idlestate usage unsigned
        ACPI / fan: Initialize acpi_state variable
        ACPI / scan: remove unused LIST_HEAD(acpi_device_list)
        ACPI / dock: Actually define acpi_dock_init() as void
        ACPI / PM: Fix corner case in acpi_bus_update_power()
        cpufreq: Fix serialization of frequency transitions
      7728f036
    • Michal Simek's avatar
      watchdog: xilinx: Fix driver header · 9419c07c
      Michal Simek authored
      - Remove reference for IP version
      - Fix header coding style
      - Remove notes which are visible from the code
      - Fix driver license according to header
      Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      9419c07c
    • Andy Shevchenko's avatar
      watchdog: wdrtas: don't use custom version of print_hex_dump · 48388069
      Andy Shevchenko authored
      Kernel has nice helpers to dump buffers.
      Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      48388069
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 8cbd0eef
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
       "There are not too many changes this time, except two new platform
        thermal drivers, ti-soc-thermal driver and x86_pkg_temp_thermal
        driver, and a couple of small fixes.
      
        Highlights:
      
         - move the ti-soc-thermal driver out of the staging tree to the
           thermal tree.
      
         - introduce the x86_pkg_temp_thermal driver.  This driver registers
           CPU digital temperature package level sensor as a thermal zone.
      
         - small fixes/cleanups including removing redundant use of
           platform_set_drvdata() and of_match_ptr for all platform thermal
           drivers"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (34 commits)
        thermal: cpu_cooling: fix stub function
        thermal: ti-soc-thermal: use standard GPIO DT bindings
        thermal: MAINTAINERS: Add git tree path for SoC specific updates
        thermal: fix x86_pkg_temp_thermal.c build and Kconfig
        Thermal: Documentation for x86 package temperature thermal driver
        Thermal: CPU Package temperature thermal
        thermal: consider emul_temperature while computing trend
        thermal: ti-soc-thermal: add DT example for DRA752 chip
        thermal: ti-soc-thermal: add dra752 chip to device table
        thermal: ti-soc-thermal: add thermal data for DRA752 chips
        thermal: ti-soc-thermal: remove usage of IS_ERR_OR_NULL
        thermal: ti-soc-thermal: freeze FSM while computing trend
        thermal: ti-soc-thermal: remove external heat while extrapolating hotspot
        thermal: ti-soc-thermal: update DT reference for OMAP5430
        x86, mcheck, therm_throt: Process package thresholds
        thermal: cpu_cooling: fix 'descend' check in get_property()
        Thermal: spear: Remove redundant use of of_match_ptr
        Thermal: kirkwood: Remove redundant use of of_match_ptr
        Thermal: dove: Remove redundant use of of_match_ptr
        Thermal: armada: Remove redundant use of of_match_ptr
        ...
      8cbd0eef
    • Hector Palacios's avatar
      watchdog: core: don't try to stop device if not running · fcf95670
      Hector Palacios authored
      A watchdog device may be stopped from userspace using WDIOC_SETOPTIONS
      ioctl and flag WDIOS_DISABLECARD. If the device is closed after this
      operation, watchdog_release() is called and status bits checked for
      stopping it. Besides, if the device has not been unregistered a critical
      message "watchdog did not stop!" is printed, although the ioctl may have
      successfully stopped it already.
      
      Without the patch a user application sample code like this will successfully
      stop the watchdog, but the kernel will output the message
      "watchdog did not stop!":
      
      	wd_fd = open("/dev/watchdog", O_RDWR);
      
      	flags = WDIOS_DISABLECARD;
      	ioctl(wd_fd, WDIOC_SETOPTIONS, &flags);
      
      	close(wd_fd);
      Signed-off-by: default avatarHector Palacios <hector.palacios@digi.com>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      fcf95670
    • Lars-Peter Clausen's avatar
      watchdog: jz4740: Pass device to clk_get · 5f314970
      Lars-Peter Clausen authored
      In preparation to switching the jz4740 clk driver to the common clk framework
      make sure to pass the device to clk_get().
      Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      5f314970
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-3.11-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 1466b77a
      Linus Torvalds authored
      Pull second set of NFS client updates from Trond Myklebust:
       "This mainly contains some small readdir optimisations that had
        dependencies on Al Viro's readdir rewrite.  There is also a fix for a
        nasty deadlock which surfaced earlier in this merge window.
      
        Highlights include:
         - Fix an_rpc pipefs regression that causes a deadlock on mount
         - Readdir optimisations by Scott Mayhew and Jeff Layton
         - clean up the rpc_pipefs dentry operation setup"
      
      * tag 'nfs-for-3.11-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        SUNRPC: Fix a deadlock in rpc_client_register()
        rpc_pipe: rpc_dir_inode_operations can be static
        NFS: Allow nfs_updatepage to extend a write under additional circumstances
        NFS: Make nfs_readdir revalidate less often
        NFS: Make nfs_attribute_cache_expired() non-static
        rpc_pipe: set dentry operations at d_alloc time
        nfs: set verifier on existing dentries in nfs_prime_dcache
      1466b77a
    • Sachin Kamat's avatar
      watchdog: twl4030: Remove redundant platform_set_drvdata() · 6638f4e5
      Sachin Kamat authored
      Commit 0998d063 (device-core: Ensure drvdata = NULL when no
      driver is bound) removes the need to set driver data field to
      NULL.
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Cc: Timo Kokkonen <timo.t.kokkonen@nokia.com>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      6638f4e5
    • Sachin Kamat's avatar
      watchdog: mpcore: Remove redundant platform_set_drvdata() · 6697dbd2
      Sachin Kamat authored
      Commit 0998d063 (device-core: Ensure drvdata = NULL when no
      driver is bound) removes the need to set driver data field to
      NULL.
      Signed-off-by: default avatarSachin Kamat <sachin.kamat@linaro.org>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      6697dbd2
    • Jingoo Han's avatar
      watchdog: da9055: use platform_{get,set}_drvdata() · 76692c94
      Jingoo Han authored
      Use the wrapper functions for getting and setting the driver data using
      platform_device instead of using dev_{get,set}_drvdata() with &pdev->dev,
      so we can directly pass a struct platform_device.
      Signed-off-by: default avatarJingoo Han <jg1.han@samsung.com>
      Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarWim Van Sebroeck <wim@iguana.be>
      76692c94