1. 10 2月, 2015 6 次提交
    • L
      Merge branch 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 23e8fe2e
      Linus Torvalds 提交于
      Pull RCU updates from Ingo Molnar:
       "The main RCU changes in this cycle are:
      
         - Documentation updates.
      
         - Miscellaneous fixes.
      
         - Preemptible-RCU fixes, including fixing an old bug in the
           interaction of RCU priority boosting and CPU hotplug.
      
         - SRCU updates.
      
         - RCU CPU stall-warning updates.
      
         - RCU torture-test updates"
      
      * 'core-rcu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (54 commits)
        rcu: Initialize tiny RCU stall-warning timeouts at boot
        rcu: Fix RCU CPU stall detection in tiny implementation
        rcu: Add GP-kthread-starvation checks to CPU stall warnings
        rcu: Make cond_resched_rcu_qs() apply to normal RCU flavors
        rcu: Optionally run grace-period kthreads at real-time priority
        ksoftirqd: Use new cond_resched_rcu_qs() function
        ksoftirqd: Enable IRQs and call cond_resched() before poking RCU
        rcutorture: Add more diagnostics in rcu_barrier() test failure case
        torture: Flag console.log file to prevent holdovers from earlier runs
        torture: Add "-enable-kvm -soundhw pcspk" to qemu command line
        rcutorture: Handle different mpstat versions
        rcutorture: Check from beginning to end of grace period
        rcu: Remove redundant rcu_batches_completed() declaration
        rcutorture: Drop rcu_torture_completed() and friends
        rcu: Provide rcu_batches_completed_sched() for TINY_RCU
        rcutorture: Use unsigned for Reader Batch computations
        rcutorture: Make build-output parsing correctly flag RCU's warnings
        rcu: Make _batches_completed() functions return unsigned long
        rcutorture: Issue warnings on close calls due to Reader Batch blows
        documentation: Fix smp typo in memory-barriers.txt
        ...
      23e8fe2e
    • L
      Merge tag 'regulator-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 30d46827
      Linus Torvalds 提交于
      Pull regulator updates from Mark Brown:
       "This has not been a busy release for the regulator framework, though
        we do have the first parts of some ongoing work from Bjorn Andersson
        to allow us to support more complex modern systems with dynamic
        configuration of regulators in suspend and idle states.
      
         - Support for device-specific properties on regulator nodes when
           using simplified DT parsing in the core from Krzysztof Kozlowski.
      
         - Restructuring of the load tracking code, intended to support future
           improvements in this area for more complex system designs.
      
         - New drivers for Maxim MAX77843 and Mediatek MT6397.
      
         - Lots of smaller fixes and improvements"
      
      * tag 'regulator-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (29 commits)
        regulator: max77843: Add max77843 regulator driver
        regulator: Fix build breakage on !REGULATOR
        regulator: Build sysfs entries with static attribute groups
        regulator: qcom-rpm: Make it possible to specify supply
        regulator: core: Consolidate drms update handling
        regulator: qcom-rpm: signedness bug in probe()
        regulator: da9211: Add gpio control for enable/disable of buck
        regulator: qcom_rpm: Don't update vreg->uV/mV if rpm_reg_write fails
        regulator: lp872x: Remove **regulators from struct lp872x
        regulator: da9211: fix unmatched of_node
        regulator: Update documentation after renaming function argument
        regulator: axp20x: Migrate to regulator core's simplified DT parsing code
        regulator: axp20x: Fill regulators_node and of_match descriptor fields
        regulator: pfuze100-regulator: add pfuze3000 support
        regulator: max77686: Document gpio properties
        regulator: Allow parsing custom properties when using simplified DT parsing
        regulator: max77686: Add GPIO control
        regulator: Copy config passed during registration
        regulator: tps65023: Constify struct regmap_config and regulator_ops
        regulator: max8649: Constify struct regmap_config and regulator_ops
        ...
      30d46827
    • L
      Merge tag 'spi-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · b0c1936c
      Linus Torvalds 提交于
      Pull spi updates from Mark Brown:
       "The major highlight this release is a refactoring of the core to allow
        us to run synchronous transfers in the context of the caller when
        there is no contention for the bus.  This improves performance in the
        very common case by eliminating context switches and reducing the
        number of hardware setup and teardown operations we need to perform.
      
        Other changes:
      
         - New drivers for DLN-2 USB-SPI adapter and ST SPI controllers.
      
         - A big round of cleanups, performance and feature improvements for
           the xilinx driver from Ricardo Ribalda Delgado.
      
         - A wide range of smaller cleanups, fixes and feature improvements
           throughout the subsystem"
      
      * tag 'spi-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (68 commits)
        spi: mxs: cleanup wait_for_completion return handling
        spi: ti-qspi: cleanup wait_for_completion return handling
        spi: spi-imx: cleanup wait_for_completion handling
        spi: sh-msiof: cleanup wait_for_completion return handling
        spi: match var type to return type of wait_for_completion
        spi: spi-pxa2xx: only include mach/dma.h for legacy DMA
        spi: atmel: cleanup wait_for_completion return handling
        spi: fsl-dspi: Remove possible memory leak of 'chip'
        spi: sh-msiof: Update calculation of frequency dividing
        spi: spidev: Convert buf pointers for 32-bit compat SPI_IOC_MESSAGE(n)
        spi/xilinx: Fix access invalid memory on xilinx_spi_tx
        spi: Revert "spi/xilinx: Remove iowrite/ioread wrappers"
        spi/xilinx: Check number of slaves range
        spi/xilinx: Use polling mode on small transfers
        spi/xilinx: Remove remaining_words driver data variable
        spi/xilinx: Remove iowrite/ioread wrappers
        spi/xilinx: Convert bits_per_word in bytes_per_word
        spi/xilinx: Convert remainding_bytes in remaining words
        spi/xilinx: Make spi_tx and spi_rx simmetric
        spi/xilinx: Remove rx_fn and tx_fn pointer
        ...
      b0c1936c
    • L
      Merge tag 'regmap-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · f381f906
      Linus Torvalds 提交于
      Pull regmap updates from Mark Brown:
       "A very quiet release for regmap this time around:
      
         - Fix an endianness issue for I2C devices connected via SMBus where
           we were getting two layers both trying to do endianness handling.
         - Use a union to reduce the size of the regmap struct.
         - A couple of smaller fixes"
      
      * tag 'regmap-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: Fix i2c word access when using SMBus access functions
        regmap: Export regmap_get_val_endian
        regmap: ac97: Clean up indentation
        regmap: correct the description of structure element in reg_field
        regmap: Move spinlock_flags into the union
      f381f906
    • L
      Merge tag 'hwmon-for-linus-v3.20' of... · 5c30c3cc
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon updates from Guenter Roeck:
       "Explicit support for ina231 added to ina2xx driver.
      
        Minor improvements, cleanup and fixes in various drivers"
      
      * tag 'hwmon-for-linus-v3.20' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: (tmp102) add hibernation callbacks
        hwmon: (ads2828) Only keep data in device data structure if needed
        hwmon: (ads2828) Convert to use regmap
        hwmon: (jc42) Allow negative hysteresis temperatures
        hwmon: (adc128d818) Do proper sign extension
        hwmon: (ad7314) Do proper sign extension
        hwmon: (abx500) Fix format string warnings
        hwmon: (jc42) Fix integer overflow when writing hysteresis value
        hwmon: (jc42) Fix integer overflow
        hwmon: (jc42) Use sign_extend32 for sign extension
        hwmon: (ina2xx) Add ina231 compatible string
        hwmon: (ina2xx) use DIV_ROUND_CLOSEST() to avoid rounding errors
        hwmon: (ina2xx) remove an unnecessary dev_get_drvdata() result check
        hwmon: (ina2xx) implement update_interval attribute for ina226
        hwmon: (ina2xx) make shunt resistance configurable at run-time
        hwmon: (ina2xx) don't accept shunt values greater than the calibration factor
        hwmon: (ina2xx) remove a stray new line
        hwmon: (ina2xx) reinitialize the chip in case it's been reset
        hwmon: (nct7802) Constify struct regmap_config
      5c30c3cc
    • G
      random: Fix fast_mix() function · 19acc77a
      George Spelvin 提交于
      There was a bad typo in commit 43759d4f ("random: use an improved
      fast_mix() function") and I didn't notice because it "looked right", so
      I saw what I expected to see when I reviewed it.
      
      Only months later did I look and notice it's not the Threefish-inspired
      mix function that I had designed and optimized.
      
      Mea Culpa.  Each input bit still has a chance to affect each output bit,
      and the fast pool is spilled *long* before it fills, so it's not a total
      disaster, but it's definitely not the intended great improvement.
      
      I'm still working on finding better rotation constants.  These are good
      enough, but since it's unrolled twice, it's possible to get better
      mixing for free by using eight different constants rather than repeating
      the same four.
      Signed-off-by: NGeorge Spelvin <linux@horizon.com>
      Cc: Theodore Ts'o <tytso@mit.edu>
      Cc: stable@vger.kernel.org  # v3.16+
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      19acc77a
  2. 09 2月, 2015 5 次提交
    • L
      Linux 3.19 · bfa76d49
      Linus Torvalds 提交于
      bfa76d49
    • L
      Merge tag 'nios2-fixes-v3.19-final' of git://git.rocketboards.org/linux-socfpga-next · da2d96d3
      Linus Torvalds 提交于
      Pull nios2 fix from Ley Foon Tan:
       "This fixes incorrect behavior of some user programs"
      
      * tag 'nios2-fixes-v3.19-final' of git://git.rocketboards.org/linux-socfpga-next:
        nios2: fix unhandled signals
      da2d96d3
    • L
      Merge git://git.kvack.org/~bcrl/aio-fixes · cdecbb33
      Linus Torvalds 提交于
      Pull aio nested sleep annotation from Ben LaHaise,
      
      * git://git.kvack.org/~bcrl/aio-fixes:
        aio: annotate aio_read_event_ring for sleep patterns
      cdecbb33
    • L
      Merge tag 'trace-fixes-v3.19-rc7' of... · 4e02370f
      Linus Torvalds 提交于
      Merge tag 'trace-fixes-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
      
      Pull ftrace fixes from Steven Rostedt:
       "During testing Sedat Dilek hit a "suspicious RCU usage" splat that
        pointed out a real bug.  During suspend and resume the tlb_flush
        tracepoint is called when the CPU is going offline.  As the CPU has
        been noted as offline, RCU is ignoring that CPU, which means that it
        can not use RCU protected locks.  When tracepoints are activated, they
        require RCU locking, and if RCU is ignoring a CPU that runs a
        tracepoint, there is a chance that the tracepoint could cause
        corruption.
      
        The solution was to change the tracepoint into a
        TRACE_EVENT_CONDITION() which allows us to check a condition to
        determine if the tracepoint should be called or not.  If the condition
        is not met, the rcu protected code will not be executed.  By adding
        the condition "cpu_online(smp_processor_id())", this will prevent the
        RCU protected code from being executed if the CPU is marked offline.
      
        After adding this, another bug was discovered.  As RCU checks rcu
        callers, if a rcu call is not done, there is no check (obviously).  We
        found that tracepoints could be added in RCU ignored locations and not
        have lockdep complain until the tracepoint is activated.  This missed
        places where tracepoints were added in places they should not have
        been.  To fix this, code was added in 3.18 that if lockdep is enabled,
        any tracepoint will still call the rcu checks even if the tracepoint
        is not enabled.  The bug here, is that the check does not take the
        CONDITION into account.  As the condition may prevent tracepoints from
        being activated in RCU ignored areas (as the one patch does), we get
        false positives when we enable lockdep and hit a tracepoint that the
        condition prevents it from being called in a RCU ignored location.
      
        The fix for this is to add the CONDITION to the rcu checks, even if
        the tracepoint is not enabled"
      
      * tag 'trace-fixes-v3.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        x86/tlb/trace: Do not trace on CPU that is offline
        tracing: Add condition check to RCU lockdep checks
      4e02370f
    • C
      nios2: fix unhandled signals · a3248d60
      Chung-Ling Tang 提交于
      Follow other architectures for user fault handling.
      Signed-off-by: NChung-Ling Tang <cltang@codesourcery.com>
      Acked-by: NLey Foon Tan <lftan@altera.com>
      a3248d60
  3. 08 2月, 2015 23 次提交
  4. 07 2月, 2015 6 次提交
    • L
      Merge branches 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of... · 26cdd1f7
      Linus Torvalds 提交于
      Merge branches 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull timer and x86 fix from Ingo Molnar:
       "A CLOCK_TAI early expiry fix and an x86 microcode driver oops fix"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        hrtimer: Fix incorrect tai offset calculation for non high-res timer systems
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86, microcode: Return error from driver init code when loader is disabled
      26cdd1f7
    • L
      Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 396e9099
      Linus Torvalds 提交于
      Pull scheduler fixes from Ingo Molnar:
       "Misc fixes"
      
      * 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        sched/deadline: Fix deadline parameter modification handling
        sched/wait: Remove might_sleep() from wait_event_cmd()
        sched: Fix crash if cpuset_cpumask_can_shrink() is passed an empty cpumask
        sched/fair: Avoid using uninitialized variable in preferred_group_nid()
      396e9099
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 29f12c48
      Linus Torvalds 提交于
      Pull core kernel fixes from Ingo Molnar:
       "Two liblockdep fixes and a CPU hotplug race fix"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        tools/liblockdep: don't include host headers
        tools/liblockdep: ignore generated .so file
        smpboot: Add missing get_online_cpus() in smpboot_register_percpu_thread()
      29f12c48
    • L
      Merge tag 'sound-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 2af613d3
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "Hopefully the final pull request for 3.19: this ended up with a
        slightly higher volume than wished, but I put them all as they are
        either stable or 3.19 regression fixes.
      
        Most of commits are from ASoC, and have been stewed for a while in
        linux-next.  The only change in the common code is the regression
        fixes for ASoC AC97 stuff wrt device registrations.  The rest are
        device-specific, mostly small fixes in various ASoC drivers and ak411x
        on ice1724 boards"
      
      * tag 'sound-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ASoC: Intel: fix sst firmware path for cht-bsw-rt5672
        ARM: dts: Fix I2S1, I2S2 compatible for exynos4 SoCs
        ASoC: sgtl5000: add delay before first I2C access
        MAINTAINERS: ASoC: add maintainer for Intel BDW/HSW ASoC driver
        ASoC: atmel_ssc_dai: fix the setting for DSP mode
        ASoC: sgtl5000: Use shift mask when setting codec mode
        ASoC: tlv320aic3x: Fix data delay configuration
        ALSA: ak411x: Fix stall in work callback
        ASoC: Intel: Used lock version to update shim registers
        ASoC: wm8731: init mutex in i2c init path
        ASoC: atmel_ssc_dai: fix start event for I2S mode
        ASoC: rt5640: Add RT5642 ACPI ID for Intel Baytrail
        ASoC: wm97xx: Reset AC'97 device before registering it
        ASoC: Add support for allocating AC'97 device before registering it
      2af613d3
    • L
      Merge branch 'akpm' (patches from Andrew Morton) · 48beb121
      Linus Torvalds 提交于
      Merge misc fixes from Andrew Morton:
       "7 fixes"
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>:
        mm/debug_pagealloc: fix build failure on ppc and some other archs
        nilfs2: fix deadlock of segment constructor over I_SYNC flag
        MAINTAINERS: remove SUPERH website
        memcg, shmem: fix shmem migration to use lrucare
        mm: export "high_memory" symbol on !MMU
        .mailmap: update Konstantin Khlebnikov's email address
        mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range
      48beb121
    • L
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · dbf3b7dd
      Linus Torvalds 提交于
      Pull MIPS fixes from Ralf Baechle:
       "The pending MIPS fixes for 3.19.  All across the field and nothing
        particularly severe or dramatic"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (23 commits)
        IRQCHIP: mips-gic: Avoid rerouting timer IRQs for smp-cmp
        MIPS: Fix syscall_get_nr for the syscall exit tracing.
        MIPS: elf2ecoff: Ignore PT_MIPS_ABIFLAGS program headers.
        MIPS: elf2ecoff: Rewrite main processing loop to switch.
        MIPS: fork: Fix MSA/FPU/DSP context duplication race
        MIPS: Fix C0_Pagegrain[IEC] support.
        MIPS: traps: Fix inline asm ctc1 missing .set hardfloat
        MIPS: mipsregs.h: Add write_32bit_cp1_register()
        MIPS: Fix kernel lockup or crash after CPU offline/online
        MIPS: OCTEON: fix kernel crash when offlining a CPU
        MIPS: ARC: Fix build error.
        MIPS: IRQ: Fix disable_irq on CPU IRQs
        MIPS: smp-mt,smp-cmp: Enable all HW IRQs on secondary CPUs
        MIPS: Fix restart of indirect syscalls
        MIPS: ELF: fix loading o32 binaries on 64-bit kernels
        MIPS: mips-cm: Fix sparse warnings
        MIPS: Kconfig: Fix recursive dependency.
        MIPS: Compat: Fix build error if CONFIG_MIPS32_COMPAT but no compat ABI.
        MIPS: JZ4740: Fixup #include's (sparse)
        MIPS: Wire up execveat(2).
        ...
      dbf3b7dd