1. 21 May, 2014 6 commits
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 1f5518b4
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This fixes a NULL pointer dereference on allocation failure in caam,
        as well as a regression in the ctr mode on s390 that was added with
        the recent concurrency fixes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: s390 - fix aes,des ctr mode concurrency finding.
        crypto: caam - add allocation failure handling in SPRINTFCAT macro
      1f5518b4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · a7aa96a9
      Linus Torvalds authored
      Pull scsi target fixes from Nicholas Bellinger:
       "This series include:
      
         - Close race between iser-target network portal shutdown + accepting
           new connection logins (sagi)
         - Fix free-after-use regression in tcm_fc post conversion to
           percpu-ida pre-allocation (nab)
         - Explicitly disable Immediate + Unsolicited Data for iser-target
           connections when T10-PI is enabled (sagi + nab)
         - Allow pi_prot_type + emulate_write_cache attributes to be set to
           zero regardless of backend support (andy)
         - memory leak fix (mikulas)"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: fix memory leak on XCOPY
        target: Don't allow setting WC emulation if device doesn't support
        iscsi-target: Disable Immediate + Unsolicited Data with ISER Protection
        tcm_fc: Fix free-after-use regression in ft_free_cmd
        iscsi-target: Change BUG_ON to REJECT in iscsit_process_nop_out
        Target/iscsi,iser: Avoid accepting transport connections during stop stage
        Target/iser: Fix iscsit_accept_np and rdma_cm racy flow
        Target/iser: Fix wrong connection requests list addition
        target: Allow non-supporting backends to set pi_prot_type to 0
      a7aa96a9
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · b1400276
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "Some I2C bugfixes for 3.15.  Typical stuff, I'd say"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: rcar: bail out on zero length transfers
        i2c: qup: Fix pm_runtime_get_sync usage
        i2c: s3c2410: resume race fix
        i2c: nomadik: Don't use IS_ERR for devm_ioremap
        i2c: designware: Mask all interrupts during i2c controller enable
      b1400276
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 478c7cf7
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
       "Still fixing regressions (partly by reverting commits that broke
        things for people), fixing other stable-candidate bugs and adding some
        blacklist entries for ACPI video and _OSI.
      
        Two ACPICA regression fixes (one recent and one for a 3.14 commit), a
        fix for an ACPI-related regression in TPM (introduced in 3.14), a
        revert of the ACPI AC driver conversion in 3.13 that went wrong for an
        unknown reason, two reverts of commits that attempted to remove an old
        user space interface in /proc and broke some utilities, in 3.13 too, a
        fix for a CPU hotplug bug in the ACPI processor driver (stable
        material), two (stable candidate) fixes for intel_pstate and a few new
        blacklist entries, mostly for systems that shipped with Windows 8.
      
        Specifics:
      
         - ACPICA fix for a stale pointer access introduced by a recent commit
           in the XSDT validation code from Lv Zheng.
      
         - ACPICA fix for the default value of the command line switch to
           favor 32-bit FADT addresses (in case there's a conflict between a
           64-bit and a 32-bit address).  The previous default was that the
           32-bit version would take precedence and we tried to change it to
           the other way around and it didn't work.  From Lv Zheng.
      
         - A TPM commit related to ACPI _DSM in 3.14 caused the driver to
           refuse to load if a specific _DSM was missing and that broke resume
           from system suspend on Chromebooks that require the TPM hardware to
           be restored to a working state during resume by the OS.  Restore
           the old behavior to load the driver if the _DSM in question is not
           present, but prevent it from using the feature the _DSM is for.
      
         - ACPI AC driver conversion in 3.13 broke thermal management on at
           least one machine and has to be reverted.  From Guenter Roeck.
      
         - Two reverts of 3.13 commits that attempted to remove the old ACPI
           battery interface in /proc, but turned out to break some utilities
           still using that interface.  From Lan Tianyu.
      
         - ACPI processor driver fix to prevent acpi_processor_add() from
           modifying the CPU device's .offline field which leads to breakage
           if the initial online of the CPU fails.  From Igor Mammedov.
      
         - Two intel_pstate fixes, one to take a BayTrail documentation update
           into account and one to avoid forcing the maximum P-state on init
           which causes CPU PM trouble on systems with P-states coordination
           when one of the CPU cores is initialized after an offline/online
           cycle triggered by user space.  Both stable candidates, from Dirk
           Brandewie.
      
         - Fix for the ACPI video DMI blacklist entry for Dell Inspiron 7520
           from Aaron Lu.
      
         - Two new ACPI video blacklist entries for machines shipping with
           Win8 that need to use native backlight so that it can be controlled
           in a usual way (which doesn't work otherwise due bugs in the ACPI
           tables) from Hans de Goede.
      
         - Two ACPI _OSI quirks for systems that need them to work correctly
           with Linux from Edward Lin and Hans de Goede"
      
      * tag 'pm+acpi-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / video: Revert native brightness quirk for ThinkPad T530
        intel_pstate: remove setting P state to MAX on init
        ACPICA: Tables: Restore old behavor to favor 32-bit FADT addresses.
        ACPI / video: correct DMI tag for Dell Inspiron 7520
        intel_pstate: Set turbo VID for BayTrail
        ACPI / TPM: Fix resume regression on Chromebooks
        ACPI / proc: Do not say when /proc interfaces will be deleted in Kconfig
        ACPI / processor: do not mark present at boot but not onlined CPU as onlined
        ACPI: Revert "ACPI / AC: convert ACPI ac driver to platform bus"
        ACPI / blacklist: Add dmi_enable_osi_linux quirk for Asus EEE PC 1015PX
        ACPI: blacklist win8 OSI for Dell Inspiron 7737
        ACPI / video: Add use_native_backlight quirks for more systems
        ACPI: Revert "ACPI / Battery: Remove battery's proc directory"
        ACPI: Revert "ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c"
        ACPICA: Tables: Fix invalid pointer accesses in acpi_tb_parse_root_table().
      478c7cf7
    • Linus Torvalds's avatar
      Merge tag 'dm-3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 23de4a7a
      Linus Torvalds authored
      Pull device mapper fixes from Mike Snitzer:
       "A dm-crypt fix for a cpu hotplug crash that switches from using
        per-cpu data to a mempool allocation (which offers allocation with cpu
        locality, and there is no inter-cpu communication on slab allocation).
      
        A couple dm-thinp stable fixes to address "out-of-data-space" issues.
      
        A dm-multipath fix for a LOCKDEP warning introduced in 3.15-rc1"
      
      * tag 'dm-3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm mpath: fix lock order inconsistency in multipath_ioctl
        dm thin: add timeout to stop out-of-data-space mode holding IO forever
        dm thin: allow metadata commit if pool is in PM_OUT_OF_DATA_SPACE mode
        dm crypt: fix cpu hotplug crash by removing per-cpu structure
      23de4a7a
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · 31a3fcab
      Linus Torvalds authored
      Pull device tree fixes from Grant Likely:
       "Drivercore bugfixes for v3.15
      
        This branch contains bug fixes important to get into v3.15.  There is
        a fix for modifying properties seen during early boot, a fix for an
        incorrect prototype when CONFIG_OF=n, and a couple of corrections to
        device tree memory nodes on a few platforms"
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
        mips: dts: Fix missing device_type="memory" property in memory nodes
        arm: dts: Fix missing device_type="memory" for ste-ccu8540
        of: fix CONFIG_OF=n prototype of of_node_full_name()
        of: make of_update_property() usable earlier in the boot process
      31a3fcab
  2. 20 May, 2014 9 commits
    • Linus Torvalds's avatar
      Merge tag 'sound-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 60b5f90d
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Unfortunately this update became bigger than previous pull requests,
        which is almost a pattern in rc5-6.  But, the only obvious big changes
        are for the new Intel DSP ASoC drivers, so the impact must be fairly
        limited.
      
        Other than that, usual small fixes in various fields: HD-audio, ASoC
        core and ASoC fsl and codec drivers"
      
      * tag 'sound-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (26 commits)
        ALSA: sb_mixer: missing return statement
        ASoC: wm8962: Update register CLASS_D_CONTROL_1 to be non-volatile
        ASoC: Intel: Fix Baytrail SST DSP firmware loading
        ALSA: hda - mask buggy stream DMA0 for Broadwell display controller
        ALSA: hda - Add new GPU codec ID to snd-hda
        ASoC: fsl_esai: Set PCRC and PRRC registers at the end of hw_params()
        ASoC: fsl_esai: Only bypass sck_div for EXTAL source
        ASoC: fsl_esai: Fix incorrect condition within ratio range check for FP
        ASoC: dapm: Fix SUSPEND -> OFF bias sequence
        ASoC: dapm: Skip CODEC<->CODEC links in connect_dai_link_widgets()
        ASoC: pcm: Fix incorrect condition check for case SNDRV_PCM_TRIGGER_SUSPEND
        ALSA: hda - add headset mic detect quirks for three Dell laptops
        ASoC: Update Cirrus Logic CODEC maintainers.
        ASoC: Intel: Fix block offset calculations.
        ASoC: Intel: Fix check for pdata usage before dereference.
        ASoC: Intel: Fix stream position pointer.
        ASoC: Intel: Fix allow hw_params to be called more than once.
        ASoC: Intel: Fix Audio DSP usage when IOMMU is enabled.
        ASoC: Intel: Fix Haswell/Broadwell DSP page table creation.
        ASoC: Intel: Fix allocated block list usage when adding blocks.
        ...
      60b5f90d
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · c7d6891a
      Linus Torvalds authored
      Pull MIPS fixes from Ralf Baechle:
       "MIPS fixes for various loose ends:
      
         - Fix workarounds for R4000 erratum.
         - Patch up DEC, Siemens-Nixdorf and Loongson hardware support.
         - Wire up renameat2 syscall.
         - Delete unused file - it was causing false warnings from maintenance
           scripts.
         - Revert a patch because it's functionality is now implemented twice
           which causes superfluous /proc/cpuinfo output.
         - Fix a microMIPS regression"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
        MIPS: mm: Fix broken microMIPS kernel regression.
        MIPS: Add new AUDIT_ARCH token for the N32 ABI on MIPS64
        MIPS: Wire up renameat2 syscall.
        MIPS: inst.h: Rename BITFIELD_FIELD to __BITFIELD_FIELD.
        MIPS: Remove file missed when removing rm9k support a while ago.
        MIPS/loongson2_cpufreq: Fix CPU clock rate setting
        MIPS: Loongson: No need to select GENERIC_HARDIRQS_NO__DO_IRQ
        MIPS: csum_partial.S CPU_DADDI_WORKAROUNDS bug fix
        MIPS: __strncpy_from_user_asm CPU_DADDI_WORKAROUNDS bug fix
        MIPS: __delay CPU_DADDI_WORKAROUNDS bug fix
        MIPS: DEC/SNI: O32 wrapper stack switching fixes
        MIPS: DEC: Bus error handler <asm/cpu-type.h> fixes
        MAINTAINERS: TURBOchannel: Update entry
        Revert "MIPS: MT: proc: Add support for printing VPE and TC ids"
      c7d6891a
    • Linus Torvalds's avatar
      Merge branch 'parisc-3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 6ed8bf82
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
       "There are two patches in here:
      
        The first patch greatly improves latency and corrects the memory
        ordering in our light-weight atomic locking syscall.
      
        The second patch ratelimits printing of userspace segfaults in the
        same way as it's done on other platforms.  This fixes a possible DOS
        on parisc since it prevents the syslog to grow too fast.  For example,
        when the debian acl2 package was built on our debian buildd servers,
        this package produced lots of gigabytes in syslog in very short time
        and thus filled our harddisks, which then turned the server nearly
        completely unaccessible and unresponsive"
      
      * 'parisc-3.15-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Improve LWS-CAS performance
        parisc: ratelimit userspace segfault printing
      6ed8bf82
    • Linus Torvalds's avatar
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 8d900e7f
      Linus Torvalds authored
      Pull two arm64 fixes from Catalin Marinas:
       - arm64 migrate_irqs() fix following commit ffde1de6 (irqchip: Gic:
         Support forced affinity setting)
       - fix arm64 pud_huge() to return 0 when only 2 levels page tables are
         used (__PAGETABLE_PMD_FOLDED defined and pmd_huge already covers
         block entries at the first level), otherwise KVM gets confused
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        arm64: fix pud_huge() for 2-level pagetables
        arm64: use cpu_online_mask when using forced irq_set_affinity
      8d900e7f
    • Linus Torvalds's avatar
      Merge tag 'metag-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag · 41abc902
      Linus Torvalds authored
      Pull Metag architecture and related fixes from James Hogan:
       "Mostly fixes for metag and parisc relating to upgrowing stacks.
      
         - Fix missing compiler barriers in metag memory barriers.
         - Fix BUG_ON on metag when RLIMIT_STACK hard limit is increased
           beyond safe value.
         - Make maximum stack size configurable.  This reduces the default
           user stack size back to 80MB (especially on parisc after their
           removal of _STK_LIM_MAX override).  This only affects metag and
           parisc.
         - Remove metag _STK_LIM_MAX override to match other arches and follow
           parisc, now that it is safe to do so (due to the BUG_ON fix
           mentioned above).
         - Finally now that both metag and parisc _STK_LIM_MAX overrides have
           been removed, it makes sense to remove _STK_LIM_MAX altogether"
      
      * tag 'metag-for-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag:
        asm-generic: remove _STK_LIM_MAX
        metag: Remove _STK_LIM_MAX override
        parisc,metag: Do not hardcode maximum userspace stack size
        metag: Reduce maximum stack size to 256MB
        metag: fix memory barriers
      41abc902
    • Linus Torvalds's avatar
      Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux · a7b08063
      Linus Torvalds authored
      Pull drm/intel fixes from Dave Airlie:
       "Just some intel fixes.
      
        I have some radeon ones but I need to get some patches dropped from
        the pull req"
      
      * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
        drm/i915: Increase WM memory latency values on SNB
        drm/i915: restore backlight precision when converting from ACPI
        drm/i915: Use the first mode if there is no preferred mode in the EDID
        drm/i915/dp: force eDP lane count to max available lanes on BDW
        drm/i915/vlv: reset VLV media force wake request register
        drm/i915/SDVO: For sysfs link put directory and target in correct order
        drm/i915: use lane count and link rate from VBT as minimums for eDP
        drm/i915: clean up VBT eDP link param decoding
        drm/i915: consider the source max DP lane count too
      a7b08063
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 172de656
      Linus Torvalds authored
      Pull x86 fixes from Peter Anvin.
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86-64, modify_ldt: Make support for 16-bit segments a runtime option
        x86, mm, hugetlb: Add missing TLB page invalidation for hugetlb_cow()
        x86, rdrand: When nordrand is specified, disable RDSEED as well
      172de656
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 95d08585
      Linus Torvalds authored
      Pull timer fix from Thomas Gleixner:
       "A single bug fix for a long standing issue:
      
         - Updating the expiry value of a relative timer _after_ letting the
           idle logic select a target cpu for the timer based on its stale
           expiry value is outright stupid.  Thanks to Viresh for spotting the
           brainfart"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        hrtimer: Set expiry time before switch_hrtimer_base()
      95d08585
    • Linus Torvalds's avatar
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3f017a4c
      Linus Torvalds authored
      Pull irq fixes from Thomas Gleixner:
       "Two small updates from the irq departement:
      
         - Provide missing inline stub for a SMP only function
      
         - Add sub-maintainer for the drivers/irqchip/ part of the irq
           subsystem.  YAY!"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        MAINTAINERS: Add co-maintainer for drivers/irqchip
        genirq: Provide irq_force_affinity fallback for non-SMP
      3f017a4c
  3. 19 May, 2014 1 commit
    • Dave Airlie's avatar
      Merge tag 'drm-intel-fixes-2014-05-16' of git://anongit.freedesktop.org/drm-intel into drm-fixes · 4ba4801d
      Dave Airlie authored
      Intel fixes for regressions, black screens and hangs, for 3.15.
      
      * tag 'drm-intel-fixes-2014-05-16' of git://anongit.freedesktop.org/drm-intel:
        drm/i915: Increase WM memory latency values on SNB
        drm/i915: restore backlight precision when converting from ACPI
        drm/i915: Use the first mode if there is no preferred mode in the EDID
        drm/i915/dp: force eDP lane count to max available lanes on BDW
        drm/i915/vlv: reset VLV media force wake request register
        drm/i915/SDVO: For sysfs link put directory and target in correct order
        drm/i915: use lane count and link rate from VBT as minimums for eDP
        drm/i915: clean up VBT eDP link param decoding
        drm/i915: consider the source max DP lane count too
      4ba4801d
  4. 17 May, 2014 1 commit
    • Mikulas Patocka's avatar
      target: fix memory leak on XCOPY · 1e1110c4
      Mikulas Patocka authored
      On each processed XCOPY command, two "kmalloc-512" memory objects are
      leaked. These represent two allocations of struct xcopy_pt_cmd in
      target_core_xcopy.c.
      
      The reason for the memory leak is that the cmd_kref field is not
      initialized (thus, it is zero because the allocations were done with
      kzalloc). When we decrement zero kref in target_put_sess_cmd, the result
      is not zero, thus target_release_cmd_kref is not called.
      
      This patch fixes the bug by moving kref initialization from
      target_get_sess_cmd to transport_init_se_cmd (this function is called from
      target_core_xcopy.c, so it will correctly initialize cmd_kref). It can be
      easily verified that all code that calls target_get_sess_cmd also calls
      transport_init_se_cmd earlier, thus moving kref_init shouldn't introduce
      any new problems.
      Signed-off-by: default avatarMikulas Patocka <mpatocka@redhat.com>
      Cc: stable@vger.kernel.org	# 3.12+
      Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
      1e1110c4
  5. 16 May, 2014 13 commits
  6. 15 May, 2014 10 commits