1. 13 Jan, 2014 10 commits
    • Tomi Valkeinen's avatar
      OMAPDSS: don't print errors on -EPROBE_DEFER · 40359a9b
      Tomi Valkeinen authored
      
      
      Nowadays it's normal to get -EPROBE_DEFER from, e.g., regulator_get. As
      -EPROBE_DEFER is not really an error, and the driver will be probed fine
      a bit later, printing an error message will just confuse the user.
      
      This patch changes omapdss to print an error for regulator_gets only if
      the error code is something else than -EPROBE_DEFER.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      40359a9b
    • Tomi Valkeinen's avatar
      OMAPFB: give informative print when probe succeeds · ab7bf423
      Tomi Valkeinen authored
      
      
      It is quite common to have omapfb probe deferred because of a missing
      resource, and to get omapfb probed succesfully a bit later. This works
      fine. However, omapfb does not give any print on a successful probe, so
      if the omapfb is actually never probed again after deferral, this is not
      shown in the log.
      
      To help debugging, add a simple print from omapfb at the end of its
      probe, saying which display it is using and in which resolution.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      ab7bf423
    • Tomi Valkeinen's avatar
      OMAPDSS: HDMI: rename resource names · 77601507
      Tomi Valkeinen authored
      
      
      The HDMI driver tries to get the needed memory resources by name and by
      ID. Resources by name are not currently defined, and will be used with
      DT boot.
      
      The resource names used in the driver are not quite perfect, and as they
      are not used yet, we can change them. This patch removes the unneeded
      "hdmi_" prefix from the names, and simplifies the names (e.g. hdmi_txphy
      -> phy).
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      77601507
    • Tomi Valkeinen's avatar
      OMAPDSS: DSI: split DSI memory map to smaller blocks · 68104467
      Tomi Valkeinen authored
      
      
      DSI contains three separate blocks: protocol engine, PHY and PLL. At the
      moment, all these are memory mapped in one big chunk. We need to split
      that memory map into smaller pieces so that we can add proper 'reg'
      properties into the DT data for each block.
      
      This patch changes the driver to map the blocks separately. It first
      tries to get the memory resource using name, used when booting with DT,
      and if that fails, it gets the memory resource by ID, in which case the
      driver gets the big chunk from platform data. That big chunk is then
      split into the smaller blocks manually.
      
      After DSS DT code has been merged and the old platform code removed, we
      can clean up the memory resource management.
      
      Instead of changing the driver in all the places where a register is
      read or written, this patch takes a shortcut: it adds an additional
      number to the struct which represents the register index. This number is
      used to decide which base address to use. In the future we should
      consider other approaches.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      68104467
    • Tomi Valkeinen's avatar
      OMAPDSS: HDMI: add missing core irq · 6873efe1
      Tomi Valkeinen authored
      
      
      HDMI_IRQ_CORE was not defined in the hdmi.h.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      6873efe1
    • Tomi Valkeinen's avatar
      OMAPDSS: HDMI: fix HDMI_WP_CLK name · 42116517
      Tomi Valkeinen authored
      
      
      HDMI_WP_CLK was wrongly defined as HDMI_WP_WP_CLK. Fix that.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      42116517
    • Tomi Valkeinen's avatar
      OMAPDSS: HDMI: fix hdmi_wait_for_bit_change · 91b53e6a
      Tomi Valkeinen authored
      
      
      hdmi_wait_for_bit_change() has two issues:
      
      The register index was passed as u16, even if the register index may be
      u32. Fix the index to u32.
      
      The function was copied from wait_for_bit_change() which waits for a
      single bit to change, but the hdmi version was changed to wait for a bit
      field. This change was not done correctly.
      
      The function is supposed to return the (last) value of the bit field,
      but it returned !val in case of timeout. This was correct for the single
      bit version, but not for the hdmi version. Fix the function to return
      the actual value in the register.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      91b53e6a
    • Tomi Valkeinen's avatar
      OMAPDSS: DISPC: fix context restore · be07dcd7
      Tomi Valkeinen authored
      
      
      DISPC_MSTANDBY_CTRL register is used in the driver, but it's not
      restored in dispc_restore_context(), causing problems after resume.
      
      Instead of adding DISPC_MSTANDBY_CTRL to dispc_restore_context(), let's
      call _omap_dispc_initial_config() as the first thing in
      dispc_runtime_resume(). This will initialize the DISPC core registers
      properly, and will avoid similar issues in the future.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      be07dcd7
    • Tomi Valkeinen's avatar
      OMAPDSS: HDMI4: remove useless func calls · f4f49c48
      Tomi Valkeinen authored
      
      
      For some reason the hdmi driver first turns off the video output when
      it's about to enable the video output. This serves no purpose, and can
      be removed.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      f4f49c48
    • Archit Taneja's avatar
      OMAPDSS: HDMI4: Accept non-standard timings · 1e676248
      Archit Taneja authored
      
      
      The hdmi4 driver currently rejects any timing which is not from the CEA or VESA
      standards. This leads hdmi rejecting any non-standard mode. A non standard
      timing may not have a valid code corresponding to it. In such cases, the HDMI
      spec suggests to set the code to 0.
      
      Modify the driver to check if the timings fall within the range of the DISPC
      TV overlay manager, and remove the check for an invalid code. Add a debug print
      specifying the mode and code in hdmi_display_set_timing.
      
      Signed-off-by: default avatarArchit Taneja <archit@ti.com>
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      1e676248
  2. 30 Dec, 2013 7 commits
    • Tomi Valkeinen's avatar
      OMAPDSS: DSI: fix fifosize · 558c73e2
      Tomi Valkeinen authored
      
      
      DSI has separate TX and RX fifos. However, the current code only has one
      field where the fifo size is stored, and the code for both TX and RX
      config write to the same field. This has not caused issues, as we've
      been using the same fifo sizes.
      
      Fix this bug by creating separate fields for TX and RX fifo sizes.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      558c73e2
    • Tomi Valkeinen's avatar
      OMAPDSS: rename display-sysfs 'name' entry · 303e4697
      Tomi Valkeinen authored
      
      
      omapdss in compat mode creates some sysfs files into the device's sysfs
      directory, including a 'name' file. This works fine for
      platform_devices, but breaks with i2c or spi devices, as those already
      have a 'name' file.
      
      Fix this by renaming the omapdss's 'name' file to 'display_name'.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      303e4697
    • Tomi Valkeinen's avatar
      OMAPDSS: DISPC: Add MFLAG defines · 29fceeeb
      Tomi Valkeinen authored
      
      
      OMAP5 has MFLAG feature in DISPC. Add the register definition and dump
      it. The register is not used yet, though.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      29fceeeb
    • Tomi Valkeinen's avatar
      OMAPDSS: apply fixes · 7a53df2c
      Tomi Valkeinen authored
      
      
      When omapfb does ovl->get_overlay_info, ovl->set_overlay_info, the set
      function may fail even if the info has not been changed. This is because
      omapdss doesn't initialize the info, but expect the caller to set valid
      values.
      
      Normally that is the case, but there is at least one corner case: if
      omapfb has not allocated memory for the overlay yet, and the user uses
      ioctl to disable the overlay to make sure it's disabled. In this case
      get_overlay_info returns invalid data, but the user is only interested
      in setting the overlay to disabled, not configuring it, and
      set_overlay_info fails.
      
      The issue is made possible by the omapfb's setup_plane ioctl, which
      groups overlay configuration and overlay enable/disable bit into the
      same struct. Thus, when you are disabling an overlay, you are also
      configuring it.
      
      This is a bit counter intuitive, so I think it's better to initialize
      the info to some valid values.
      
      The fields requiring initialization are color_mode and rotation_type,
      and also we need to remove the check for (paddr == 0), as paddr is 0 for
      unallocated overlay (but it's still fine to disable the overlay).
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      7a53df2c
    • Tomi Valkeinen's avatar
      OMAPDSS: fix debug prints · ac9f2421
      Tomi Valkeinen authored
      
      
      Fix debug prints all over omapdss:
      * add missing linefeeds
      * change pr_err/pr_debug to DSSERR/DSSDBG
      * add missing DSS_SUBSYS_NAMEs
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      ac9f2421
    • Tomi Valkeinen's avatar
      OMAPDSS: fix missing EXPORT_SYMBOL()s · 8ee5c842
      Tomi Valkeinen authored
      
      
      Functions dispc_ovl_set_fifo_threshold and
      dispc_ovl_compute_fifo_thresholds need to be exported. Add the
      EXPORT_SYMBOLs.
      
      Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
      8ee5c842
    • Linus Torvalds's avatar
      Linux 3.13-rc6 · 802eee95
      Linus Torvalds authored
      802eee95
  3. 29 Dec, 2013 3 commits
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · d7ada73c
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "Another smallish batch of fixes, it's been quiet due to the holidays.
        Nothing controversial here, a handful of things across the board"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
        ARM: pxa: fix USB gadget driver compilation regression
        ARM: OMAP2+: Fix LCD panel backlight regression for LDP legacy booting
        ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data
        ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL
        ARM: shmobile: r8a7790: fix shdi resource sizes
        ARM: shmobile: bockw: fixup DMA mask
        ARM: shmobile: armadillo: Add PWM backlight power supply
      d7ada73c
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 8cf126d9
      Linus Torvalds authored
      Pull x86 fixes from Peter Anvin:
       "There is a small EFI fix and a big power regression fix in this batch.
      
        My queue also had a fix for downing a CPU when there are insufficient
        number of IRQ vectors available, but I'm holding that one for now due
        to recent bug reports"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/efi: Don't select EFI from certain special ACPI drivers
        x86 idle: Repair large-server 50-watt idle-power regression
      8cf126d9
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · bddffa28
      Linus Torvalds authored
      Pull ACPI and power management fixes and new device IDs from Rafael Wysocki:
      
       - Fix for a cpufreq regression causing stale sysfs files to be left
         behind during system resume if cpufreq_add_dev() fails for one or
         more CPUs from Viresh Kumar.
      
       - Fix for a bug in cpufreq causing CONFIG_CPU_FREQ_DEFAULT_* to be
         ignored when the intel_pstate driver is used from Jason Baron.
      
       - System suspend fix for a memory leak in pm_vt_switch_unregister()
         that forgot to release objects after removing them from
         pm_vt_switch_list.  From Masami Ichikawa.
      
       - Intel Valley View device ID and energy unit encoding update for the
         (recently added) Intel RAPL (Running Average Power Limit) driver from
         Jacob Pan.
      
       - Intel Bay Trail SoC GPIO and ACPI device IDs for the Low Power
         Subsystem (LPSS) ACPI driver from Paul Drews.
      
      * tag 'pm+acpi-3.13-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        powercap / RAPL: add support for ValleyView Soc
        PM / sleep: Fix memory leak in pm_vt_switch_unregister().
        cpufreq: Use CONFIG_CPU_FREQ_DEFAULT_* to set initial policy for setpolicy drivers
        cpufreq: remove sysfs files for CPUs which failed to come back after resume
        ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs
      bddffa28
  4. 28 Dec, 2013 3 commits
  5. 27 Dec, 2013 2 commits
  6. 26 Dec, 2013 5 commits
    • Rafael J. Wysocki's avatar
      Merge branches 'powercap' and 'acpi-lpss' with new device IDs · bfde19c4
      Rafael J. Wysocki authored
      * powercap:
        powercap / RAPL: add support for ValleyView Soc
      
      * acpi-lpss:
        ACPI: Add BayTrail SoC GPIO and LPSS ACPI IDs
      bfde19c4
    • Rafael J. Wysocki's avatar
      Merge branches 'pm-cpufreq' and 'pm-sleep' containing PM fixes · 1a672535
      Rafael J. Wysocki authored
      * pm-cpufreq:
        cpufreq: Use CONFIG_CPU_FREQ_DEFAULT_* to set initial policy for setpolicy drivers
        cpufreq: remove sysfs files for CPUs which failed to come back after resume
      
      * pm-sleep:
        PM / sleep: Fix memory leak in pm_vt_switch_unregister().
      1a672535
    • Linus Torvalds's avatar
      Merge tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · f41bfc94
      Linus Torvalds authored
      Pull ext4 fixes from Ted Ts'o:
       "A collection of bug fixes destined for stable and some printk cleanups
        and a patch so that instead of BUG'ing we use the ext4_error()
        framework to mark the file system is corrupted"
      
      * tag 'ext4_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4:
        ext4: add explicit casts when masking cluster sizes
        ext4: fix deadlock when writing in ENOSPC conditions
        jbd2: rename obsoleted msg JBD->JBD2
        jbd2: revise KERN_EMERG error messages
        jbd2: don't BUG but return ENOSPC if a handle runs out of space
        ext4: Do not reserve clusters when fs doesn't support extents
        ext4: fix del_timer() misuse for ->s_err_report
        ext4: check for overlapping extents in ext4_valid_extent_entries()
        ext4: fix use-after-free in ext4_mb_new_blocks
        ext4: call ext4_error_inode() if jbd2_journal_dirty_metadata() fails
      f41bfc94
    • Suman Anna's avatar
      ARM: OMAP2+: hwmod_data: fix missing OMAP_INTC_START in irq data · 6d4c8830
      Suman Anna authored
      Commit 7d7e1eba (ARM: OMAP2+: Prepare for irqs.h removal) and commit
      ec2c0825
      
       (ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ)
      updated the way interrupts for OMAP2/3 devices are defined in the
      HWMOD data structures to being an index plus a fixed offset (defined
      by OMAP_INTC_START).
      
      Couple of irqs in the OMAP2/3 hwmod data were misconfigured completely
      as they were missing this OMAP_INTC_START relative offset. Add this
      offset back to fix the incorrect irq data for the following modules:
      	OMAP2 - GPMC, RNG
      	OMAP3 - GPMC, ISP MMU & IVA MMU
      
      Signed-off-by: default avatarSuman Anna <s-anna@ti.com>
      Fixes: 7d7e1eba ("ARM: OMAP2+: Prepare for irqs.h removal")
      Fixes: ec2c0825
      
       ("ARM: OMAP2+: Remove hardcoded IRQs and enable SPARSE_IRQ")
      Cc: Tony Lindgren <tony@atomide.com>
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      6d4c8830
    • Rajendra Nayak's avatar
      ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL · 38958c15
      Rajendra Nayak authored
      With commit '7dedd346
      
      : ARM: OMAP2+: hwmod: Fix a crash in _setup_reset() with
       DEBUG_LL' we moved from parsing cmdline to identify uart used for earlycon
      to using the requsite hwmod CONFIG_DEBUG_OMAPxUARTy FLAGS.
      
      On DRA7 though, we seem to be missing this flag, and atleast on the DRA7 EVM
      where we use uart1 for console, boot fails with DEBUG_LL enabled.
      
      Reported-by: Lokesh Vutla's avatarLokesh Vutla <lokeshvutla@ti.com>
      Tested-by:  Lokesh Vutla <lokeshvutla@ti.com> # on a different base
      Signed-off-by: default avatarRajendra Nayak <rnayak@ti.com>
      Fixes: 7dedd346
      
       ("ARM: OMAP2+: hwmod: Fix a crash in _setup_reset() with DEBUG_LL")
      Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
      38958c15
  7. 24 Dec, 2013 8 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · c5fdd531
      Linus Torvalds authored
      Pull block fixes from Jens Axboe:
       - fix for a memory leak on certain unplug events
       - a collection of bcache fixes from Kent and Nicolas
       - a few null_blk fixes and updates form Matias
       - a marking of static of functions in the stec pci-e driver
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        null_blk: support submit_queues on use_per_node_hctx
        null_blk: set use_per_node_hctx param to false
        null_blk: corrections to documentation
        null_blk: warning on ignored submit_queues param
        null_blk: refactor init and init errors code paths
        null_blk: documentation
        null_blk: mem garbage on NUMA systems during init
        drivers: block: Mark the functions as static in skd_main.c
        bcache: New writeback PD controller
        bcache: bugfix for race between moving_gc and bucket_invalidate
        bcache: fix for gc and writeback race
        bcache: bugfix - moving_gc now moves only correct buckets
        bcache: fix for gc crashing when no sectors are used
        bcache: Fix heap_peek() macro
        bcache: Fix for can_attach_cache()
        bcache: Fix dirty_data accounting
        bcache: Use uninterruptible sleep in writeback
        bcache: kthread don't set writeback task to INTERUPTIBLE
        block: fix memory leaks on unplugging block device
        bcache: fix sparse non static symbol warning
      c5fdd531
    • Linus Torvalds's avatar
      Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 70e672fa
      Linus Torvalds authored
      Pull cgroup fixes from Tejun Heo:
       "Two fixes.  One fixes a bug in the error path of cgroup_create().  The
        other changes cgrp->id lifetime rule so that the id doesn't get
        recycled before all controller states are destroyed.  This premature
        id recycling made memcg malfunction"
      
      * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: don't recycle cgroup id until all csses' have been destroyed
        cgroup: fix cgroup_create() error handling path
      70e672fa
    • Linus Torvalds's avatar
      Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · f6398600
      Linus Torvalds authored
      Pull percpu fix from Tejun Heo:
       "A single commit to fix a spurious sparse warning coming from
        DEFINE_PER_CPU()'s hack to support the use of weak symbols.  Shouldn't
        cause observable behavior change"
      
      * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: fix spurious sparse warnings from DEFINE_PER_CPU()
      f6398600
    • Linus Torvalds's avatar
      Merge branch 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 4b69316e
      Linus Torvalds authored
      Pull libata fixes from Tejun Heo:
       "There's one interseting commit - "libata, freezer: avoid block device
        removal while system is frozen".  It's an ugly hack working around a
        deadlock condition between driver core resume and block layer device
        removal paths through freezer which was made more reproducible by
        writeback being converted to workqueue some releases ago.  The bug has
        nothing to do with libata but it's just an workaround which is easy to
        backport.  After discussion, Rafael and I seem to agree that we don't
        really need kernel freezables - both kthread and workqueue.  There are
        few specific workqueues which constitute PM operations and require
        freezing, which will be converted to use workqueue_set_max_active()
        instead.  All other kernel freezer uses are planned to be removed,
        followed by the removal of kthread and workqueue freezer support,
        hopefully.
      
        Others are device-specific fixes.  The most notable is the addition of
        NO_NCQ_TRIM which is used to disable queued TRIM commands to Micro
        M500 SSDs which otherwise suffers data corruption"
      
      * 'for-3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        libata, freezer: avoid block device removal while system is frozen
        libata: implement ATA_HORKAGE_NO_NCQ_TRIM and apply it to Micro M500 SSDs
        libata: disable a disk via libata.force params
        ahci: bail out on ICH6 before using AHCI BAR
        ahci: imx: Explicitly clear IMX6Q_GPR13_SATA_MPLL_CLK_EN
        libata: add ATA_HORKAGE_BROKEN_FPDMA_AA quirk for Seagate Momentus SpinPoint M8
      4b69316e
    • Ard Biesheuvel's avatar
      auxvec.h: account for AT_HWCAP2 in AT_VECTOR_SIZE_BASE · f60900f2
      Ard Biesheuvel authored
      Commit 2171364d
      
       ("powerpc: Add HWCAP2 aux entry") introduced a new
      AT_ auxv entry type AT_HWCAP2 but failed to update AT_VECTOR_SIZE_BASE
      accordingly.
      
      Signed-off-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
      Fixes: 2171364d
      
       (powerpc: Add HWCAP2 aux entry)
      Cc: stable@vger.kernel.org
      Acked-by: default avatarMichael Neuling <michael@neuling.org>
      Cc: Nishanth Aravamudan <nacc@linux.vnet.ibm.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      f60900f2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · b257bab5
      Linus Torvalds authored
      Pull SELinux fixes from James Morris.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        selinux: selinux_setprocattr()->ptrace_parent() needs rcu_read_lock()
        selinux: fix broken peer recv check
      b257bab5
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · dc0a6b4f
      Linus Torvalds authored
      Pull ext2 fix from Jan Kara:
       "One simple fix of oops in ext2 which was recently hit by Christoph"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ext2: Fix oops in ext2_get_block() called from ext2_quota_write()
      dc0a6b4f
    • Linus Torvalds's avatar
      Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband · 6961bc6c
      Linus Torvalds authored
      Pull infiniband fixes from Roland Dreier:
       "Last batch of InfiniBand/RDMA changes for 3.13 / 2014:
         - Additional checks for uverbs to ensure forward compatibility,
           handle malformed input better.
         - Fix potential use-after-free in iWARP connection manager.
         - Make a function static"
      
      * tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
        IB/uverbs: Check access to userspace response buffer in extended command
        IB/uverbs: Check input length in flow steering uverbs
        IB/uverbs: Set error code when fail to consume all flow_spec items
        IB/uverbs: Check reserved fields in create_flow
        IB/uverbs: Check comp_mask in destroy_flow
        IB/uverbs: Check reserved field in extended command header
        IB/uverbs: New macro to set pointers to NULL if length is 0 in INIT_UDATA()
        IB/core: const'ify inbuf in struct ib_udata
        RDMA/iwcm: Don't touch cm_id after deref in rem_ref
        RDMA/cxgb4: Make _c4iw_write_mem_dma() static
      6961bc6c
  8. 23 Dec, 2013 2 commits