1. 06 12月, 2013 3 次提交
    • L
      Merge tag 'fbdev-fixes-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux · 59fb2f0e
      Linus Torvalds 提交于
      Pull minor fbdev fixes from Tomi Valkeinen.
      
      * tag 'fbdev-fixes-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
        video: vt8500: fix error handling in probe()
        atmel_lcdfb: fix module autoload
        fbdev: sh_mobile_meram: Fix defined but not used compiler warnings
        video: kyro: fix incorrect sizes when copying to userspace
        ARM: OMAPFB: panel-sony-acx565akm: fix bad unlock balance
      59fb2f0e
    • L
      Merge tag 'sound-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 09759d1e
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "A usual pattern of half ASoC and half HD-audio fixes, although
        HD-audio fixups have more volumes, in addition to a couple of trivial
        fixes.  Nothing to worry much is found here.
      
        For ASoC side: a few fixes for PCM rate constraints calculations,
        regmap byte-order fix, the rest driver specific fixes (atmel, fsl,
        omap, kirkwood, wm codecs).
      
        For HD-audio: Dell headset and mono out fix, ELD update in polling
        mode, ALC283 Chromebook fixes, a few fixes for old AD codecs and
        MBA2, one regression fix"
      
      * tag 'sound-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (30 commits)
        ALSA: hda - Fix silent output on MacBook Air 2,1
        ALSA: hda - Fix missing ELD info when using jackpoll_ms parameter
        ALSA: hda/realtek - remove hp_automute_hook from alc283_fixup_chromebook
        ASoC: wm8731: fix dsp mode configuration
        ALSA: hda/realtek - Independent of model for HP
        ALSA: hda - Fix headset mic input after muted internal mic (Dell/Realtek)
        ALSA: hda - Use always amps for auto-mute on AD1986A codec
        ALSA: hda/analog - Handle inverted EAPD properly in vmaster hook
        ALSA: hda - Another fixup for ASUS laptop with ALC660 codec
        ALSA: atmel: Fix possible array overflow
        ALSA: hda - Fix complete_all() timing in deferred probes
        ALSA: hda - Fix bad EAPD setup for HP machines with AD1984A
        ASoC: core: fix devres parameter in devm_snd_soc_register_card()
        ASoC: omap: n810: Convert to clk_prepare_enable/clk_disable_unprepare
        ASoC: fsl: set correct platform drvdata in pcm030_fabric_probe()
        ASoC: fsl: imx-pcm-fiq: Remove unused 'runtime' variable
        ASoC: fsl: imx-pcm-fiq: remove bogus period delta calculation
        ALSA: hda - Fix silent output on ASUS W7J laptop
        ASoC: core: Use consistent byte ordering in snd_soc_bytes_get
        ALSA: dice: fix array limits in dice_proc_read()
        ...
      09759d1e
    • L
      Merge tag 'pinctrl-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · da1965d3
      Linus Torvalds 提交于
      Pull pin control fixes from Linus Walleij:
      
       - Minor bug fixes for the Rockchip, ST-Ericsson abx500, Renesas PFC
         r8a7740 and sh7372.
      
       - Compilation warning fixes.
      
      * tag 'pinctrl-v3.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        sh-pfc: sh7372: Fix pin bias setup
        sh-pfc: r8a7740: Fix pin bias setup
        pinctrl: abx500: Fix header file include guard
        pinctrl: rockchip: missing unlock on error in rockchip_set_pull()
        pinctrl: abx500: fix some more bitwise AND tests
        pinctrl: rockchip: testing the wrong variable
      da1965d3
  2. 05 12月, 2013 9 次提交
    • L
      Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 53c6de50
      Linus Torvalds 提交于
      Pull x86 and EFI fixes from Peter Anvin:
       "Half of these are EFI-related:
      
        The by far biggest change is the change to hold off the deletion of a
        sysfs entry while a backend scan is in progress.  This is to avoid
        calling kmemdup() while under a spinlock.
      
        The other major change is for each entry in the EFI pstore backend to
        get a unique identifier, as required by the pstore filesystem proper.
      
        The other changes are:
      
        A fix to the recent consolidation and optimization of using "asm goto"
        with read-modify-write operation, which broke the bitops; specifically
        in such a way that we could end up generating invalid code.
      
        A build hack to make sure we compile with -mno-sse.  icc, and most
        likely future versions of gcc, can generate SSE instructions unless we
        tell it not to.
      
        A comment-only patch to a change the was due in part to an unpublished
        erratum; now when the erratum is published we want to add a comment
        explaining why"
      
      * 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/apic, doc: Justification for disabling IO APIC before Local APIC
        x86, bitops: Correct the assembly constraints to testing bitops
        x86-64, build: Always pass in -mno-sse
        efi-pstore: Make efi-pstore return a unique id
        x86/efi: Fix earlyprintk off-by-one bug
        efivars, efi-pstore: Hold off deletion of sysfs entry until the scan is completed
      53c6de50
    • F
      x86/apic, doc: Justification for disabling IO APIC before Local APIC · 2885432a
      Fenghua Yu 提交于
      Since erratum AVR31 in "Intel Atom Processor C2000 Product Family
      Specification Update" is now published, I added a justification
      comment for disabling IO APIC before Local APIC, as changed in commit:
      
      522e6646 x86/apic: Disable I/O APIC before shutdown of the local APIC
      Signed-off-by: NFenghua Yu <fenghua.yu@intel.com>
      Link: http://lkml.kernel.org/r/1386202069-51515-1-git-send-email-fenghua.yu@intel.comSigned-off-by: NH. Peter Anvin <hpa@linux.intel.com>
      2885432a
    • H
      x86, bitops: Correct the assembly constraints to testing bitops · e0f6dec3
      H. Peter Anvin 提交于
      In checkin:
      
      0c44c2d0 x86: Use asm goto to implement better modify_and_test() functions
      
      the various functions which do modify and test were unified and
      optimized using "asm goto".  However, this change missed the detail
      that the bitops require an "Ir" constraint rather than an "er"
      constraint ("I" = integer constant from 0-31, "e" = signed 32-bit
      integer constant).  This would cause code to miscompile if these
      functions were used on constant bit positions 32-255 and the build to
      fail if used on constant bit positions above 255.
      
      Add the constraints as a parameter to the GEN_BINARY_RMWcc() macro to
      avoid this problem.
      Reported-by: NJesse Brandeburg <jesse.brandeburg@intel.com>
      Signed-off-by: NH. Peter Anvin <hpa@linux.intel.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Link: http://lkml.kernel.org/r/529E8719.4070202@zytor.com
      e0f6dec3
    • L
      Merge tag 'gpio-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 8ecffd79
      Linus Torvalds 提交于
      Pull GPIO fixes from Linus Walleij:
       "Here are a few more GPIO patches, we're a bit noisy for being the GPIO
        subsystem, mostly due to the new descriptor API, but all is getting
        into shape.
      
         - Fix compile warnings
      
         - Fix overly talkative diagnostic messages from usual use cases wrt
           GPIO descriptors
      
         - Add a documentation 00-INDEX
      
         - Use platform GPIOs as fallback when ACPI or device tree is used as
           the primary means to get GPIO lines
      
         - A bug fix for the MPC8572/MPC8536 fixing erroneous input data"
      
      * tag 'gpio-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpiolib: change a warning to debug message when failing to get gpio
        powerpc/gpio: Fix the wrong GPIO input data on MPC8572/MPC8536
        gpiolib: use platform GPIO mappings as fallback
        Documentation: gpiolib: add 00-INDEX file
        gpiolib: fix lookup of platform-mapped GPIOs
        gpiolib: add missing declarations
      8ecffd79
    • L
      Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 36059ee2
      Linus Torvalds 提交于
      Pull ARM SoC fixes from Olof Johansson:
       "Another batch of fixes for ARM SoCs for 3.13.  The diffstat is large,
        mostly because of:
      
         - Another set of fixes to fix regressions caused by moving OMAP from
           board files to DT.  Tony thinks this was the last major set of
           fixes, with maybe just a few small patches to follow.
         - More fixes for Marvell platforms, most dealing with misdescribed
           PCIe hardware, i.e.  incorrect number of busses on some SoCs, etc.
           The line delta adds up due to various ranges moving around when
           this is fixed.
      
        But there's also:
      
         - Some smaller tweaks to defconfigs to make more boards bootable in
           my test setup for better coverage.
         - There are also a few other smaller fixes, a short series for at91,
           a couple of reverts for ux500, etc"
      
      * tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (39 commits)
        arm: dts: socfpga: Change some clocks of gate-clk type to perip-clk
        arm: socfpga: Enable ARM_TWD for socfpga
        ARM: multi_v7_defconfig: enable SDHCI_BCM_KONA and MMC_BLOCK_MINORS=16
        ARM: sunxi_defconfig: enable NFS, TMPFS, PRINTK_TIME and nfsroot support
        ARM: multi_v7_defconfig: enable network for BeagleBone Black
        ARM: dts: Fix the name of supplies for smsc911x shared by OMAP
        ARM: OMAP2+: Powerdomain: Fix unchecked dereference of arch_pwrdm
        ARM: dts: omap3-beagle: Add omap-twl4030 audio support
        ARM: dts: omap4-sdp: Fix pin muxing for wl12xx
        ARM: dts: omap4-panda-common: Fix pin muxing for wl12xx
        ARM: at91: fixed unresolved symbol "at91_pm_set_standby" when built without CONFIG_PM
        ARM: at91: add usart3 alias to dtsi
        ARM: at91: sama5d3: reduce TWI internal clock frequency
        mmc: omap: Fix I2C dependency and make driver usable with device tree
        mmc: omap: Fix DMA configuration to not rely on device id
        ARM: dts: omap3-beagle: Fix USB host on beagle boards (for 3.13)
        ARM: dts: omap3-igep0020: name twl4030 VPLL2 regulator as vdds_dsi
        ARM: dts: AM33XX IGEP0033: add USB support
        ARM: dts: AM33XX BASE0033: add 32KBit EEPROM support
        ARM: dts: AM33XX BASE0033: add pinmux and user led support
        ...
      36059ee2
    • L
      Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · 8aa9c367
      Linus Torvalds 提交于
      Pull parsic updates from Helge Deller:
       - a fix for the mmap(MAP_FIXED|MAP_SHARED) syscall to the same address
         which was already given in a previous call (fixes locale-gen on
         debian)
       - change the memory layout of the kernel to avoid the need for the
         -mlong-calls compiler option (depends on commit 5ecbe3c3 -
         "kernel/extable: fix address-checks for core_kernel and init areas")
       - defconfig updates, e.g.  use the SIL680 driver instead of the SIIMAGE
         driver
       - add more parisc machine names to the machine database
      
      * 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: update 64bit defconfigs and use SIL680 instead of SIIMAGE driver
        parisc: remove CONFIG_MLONGCALLS=y from defconfigs
        parisc: fix kernel memory layout in vmlinux.ld.S
        parisc: use kernel_text_address() in unwind functions
        parisc: remove empty SERIAL_PORT_DFNS in serial.h
        parisc: add some more machine names to hardware database
        parisc: fix mmap(MAP_FIXED|MAP_SHARED) to already mmapped address
      8aa9c367
    • L
      Merge tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next · 27871790
      Linus Torvalds 提交于
      Pull squashfs bugfix from Phillip Lougher:
       "Just a single bug fix to the new "directly decompress into the page
        cache" code"
      
      * tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pkl/squashfs-next:
        Squashfs: fix failure to unlock pages on decompress error
      27871790
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · d644c026
      Linus Torvalds 提交于
      Pull crypto fixes from Herbert Xu:
       "This push fixes a number of crashes triggered by a previous crypto
        self-test update.  It also fixes a build problem in the caam driver,
        as well as a concurrency issue in s390.
      
        Finally there is a pair of fixes to bugs in the crypto scatterwalk
        code and authenc that may lead to crashes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: testmgr - fix sglen in test_aead for case 'dst != src'
        crypto: talitos - fix aead sglen for case 'dst != src'
        crypto: caam - fix aead sglen for case 'dst != src'
        crypto: ccm - Fix handling of zero plaintext when computing mac
        crypto: s390 - Fix aes-xts parameter corruption
        crypto: talitos - corrrectly handle zero-length assoc data
        crypto: scatterwalk - Set the chain pointer indication bit
        crypto: authenc - Find proper IV address in ablkcipher callback
        crypto: caam - Add missing Job Ring include
      d644c026
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1ab231b2
      Linus Torvalds 提交于
      Pull timer fixes from Thomas Gleixner:
      
       - timekeeping: Cure a subtle drift issue on GENERIC_TIME_VSYSCALL_OLD
      
       - nohz: Make CONFIG_NO_HZ=n and nohz=off command line option behave the
         same way.  Fixes a long standing load accounting wreckage.
      
       - clocksource/ARM: Kconfig update to avoid ARM=n wreckage
      
       - clocksource/ARM: Fixlets for the AT91 and SH clocksource/clockevents
      
       - Trivial documentation update and kzalloc conversion from akpms pile
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        nohz: Fix another inconsistency between CONFIG_NO_HZ=n and nohz=off
        time: Fix 1ns/tick drift w/ GENERIC_TIME_VSYSCALL_OLD
        clocksource: arm_arch_timer: Hide eventstream Kconfig on non-ARM
        clocksource: sh_tmu: Add clk_prepare/unprepare support
        clocksource: sh_tmu: Release clock when sh_tmu_register() fails
        clocksource: sh_mtu2: Add clk_prepare/unprepare support
        clocksource: sh_mtu2: Release clock when sh_mtu2_register() fails
        ARM: at91: rm9200: switch back to clockevents_config_and_register
        tick: Document tick_do_timer_cpu
        timer: Convert kmalloc_node(...GFP_ZERO...) to kzalloc_node(...)
        NOHZ: Check for nohz active instead of nohz enabled
      1ab231b2
  3. 04 12月, 2013 21 次提交
  4. 03 12月, 2013 7 次提交