1. 09 12月, 2013 2 次提交
    • L
      Merge tag 'usb-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · b19d69c7
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here are a bunch of USB fixes for 3.13-rc3.
      
        Nothing major, but we seem to have an argument about a XHCI fix, so
        I'm not including a revert that Sarah requested, because that breaks a
        USB network driver, and I can't revert the USB network driver fix
        without reintroducing other bugs that it fixed.  So as it is,
        everything should now be working.  Worse case, I can revert the XHCI
        fix before 3.13-final is out, but it seems to work well here with my
        testing, so all should be good.
      
        Other than that, some driver updates based on reports"
      
      * tag 'usb-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (40 commits)
        usb: hub: Use correct reset for wedged USB3 devices that are NOTATTACHED
        usb: ohci-pxa27x: include linux/dma-mapping.h
        USB: cdc-acm: Added support for the Lenovo RD02-D400 USB Modem
        usb: tools: fix a regression issue that gcc can't link to pthread
        USB: switch maintainership of chipidea to Peter
        USB: pl2303: fixed handling of CS5 setting
        USB: ftdi_sio: fixed handling of unsupported CSIZE setting
        USB: mos7840: correct handling of CS5 setting
        USB: spcp8x5: correct handling of CS5 setting
        usb: wusbcore: fix deadlock in wusbhc_gtk_rekey
        usb: wusbcore: do device lookup while holding the hc mutex
        usb: wusbcore: send keepalives to unauthenticated devices
        USB: option: support new huawei devices
        USB: serial: option: blacklist interface 1 for Huawei E173s-6
        usb: xhci: Link TRB must not occur within a USB payload burst
        usb: gadget: f_mass_storage: call try_to_freeze only when its safe
        usb: gadget: tcm_usb_gadget: mark bot_cleanup_old_alt static
        usb: gadget: ffs: fix sparse warning
        usb: gadget: zero: module parameters can be static
        usb: gadget: storage: fix sparse warning
        ...
      b19d69c7
    • L
      Merge tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 · 7d49efe2
      Linus Torvalds 提交于
      Pull ARM64 fixes from Catalin Marinas:
       - Page table fixes (PROT_NONE, shareability attribute, TLB
         invalidation)
       - Secondary CPUs entry endianness fix
       - Make NR_CPUS default to 8
      
      * tag 'arm64-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64:
        arm64: mm: Fix PMD_SECT_PROT_NONE definition
        arm64: Fix memory shareability attribute for ioremap_wc/cache
        arm64: kernel: add code to set cpu boot mode to secondary_entry shim
        arm64: make default NR_CPUS 8
        arm64: ensure completion of TLB invalidatation
      7d49efe2
  2. 07 12月, 2013 11 次提交
  3. 06 12月, 2013 15 次提交
    • G
      aio: clean up aio ring in the fail path · d1b94327
      Gu Zheng 提交于
      Clean up the aio ring file in the fail path of aio_setup_ring
      and ioctx_alloc. And maybe it can fix the GPF issue reported by
      Dave Jones:
      https://lkml.org/lkml/2013/11/25/898Signed-off-by: NGu Zheng <guz.fnst@cn.fujitsu.com>
      Signed-off-by: NBenjamin LaHaise <bcrl@kvack.org>
      d1b94327
    • J
      Merge branch 'free-memory' of... · bfb26328
      James Morris 提交于
      Merge branch 'free-memory' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity into for-linus
      bfb26328
    • L
      Merge tag 'pm-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 002acf1f
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
      
       - cpufreq regression fix from Bjørn Mork restoring the pre-3.12
         behavior of the framework during system suspend/hibernation to avoid
         garbage sysfs files from being left behind in case of a suspend error
      
       - PNP regression fix to restore the correct states of devices after
         resume from hibernation broken in 3.12.  From Dmitry Torokhov.
      
       - cpuidle fix to prevent cpuidle device unregistration from crashing
         due to a NULL pointer dereference if cpuidle has been disabled from
         the kernel command line.  From Konrad Rzeszutek Wilk.
      
       - intel_idle fix for the C6 state definition on Intel Avoton/Rangeley
         processors from Arne Bockholdt.
      
       - Power capping framework fix to make the energy_uj sysfs attribute
         work in accordance with the documentation.  From Srinivas Pandruvada.
      
       - epoll fix to make it ignore the EPOLLWAKEUP flag if the kernel has
         been compiled with CONFIG_PM_SLEEP unset (in which case that flag
         should not have any effect).  From Amit Pundir.
      
       - cpufreq fix to prevent governor sysfs files from being lost over
         system suspend/resume in some (arguably unusual) situations.  From
         Viresh Kumar.
      
      * tag 'pm-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PowerCap: Fix mode for energy counter
        PNP: fix restoring devices after hibernation
        cpuidle: Check for dev before deregistering it.
        epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
        cpufreq: fix garbage kobjects on errors during suspend/resume
        cpufreq: suspend governors on system suspend/hibernate
        intel_idle: Fixed C6 state on Avoton/Rangeley processors
      002acf1f
    • R
      Merge branches 'pm-epoll', 'pnp' and 'powercap' · 8e703009
      Rafael J. Wysocki 提交于
      * pm-epoll:
        epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
      
      * pnp:
        PNP: fix restoring devices after hibernation
      
      * powercap:
        PowerCap: Fix mode for energy counter
      8e703009
    • R
      Merge branches 'pm-cpuidle' and 'pm-cpufreq' · 7cdcec99
      Rafael J. Wysocki 提交于
      * pm-cpuidle:
        cpuidle: Check for dev before deregistering it.
        intel_idle: Fixed C6 state on Avoton/Rangeley processors
      
      * pm-cpufreq:
        cpufreq: fix garbage kobjects on errors during suspend/resume
        cpufreq: suspend governors on system suspend/hibernate
      7cdcec99
    • L
      Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile · b52b342d
      Linus Torvalds 提交于
      Pull arch/tile ftrace bug fix from Chris Metcalf:
       "This fixes a build failure with allyesconfig reported by Fengguang Wu
        and fixed by Tony Lu"
      
      * 'stable' of git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile:
        ftrace: default to tilegx if ARCH=tile is specified
      b52b342d
    • L
      Merge branch 'for-linus' of git://git.kernel.dk/linux-block · 5ee54061
      Linus Torvalds 提交于
      Pull block layer fixes from Jens Axboe:
       "A small collection of fixes for the current series. It contains:
      
         - A fix for a use-after-free of a request in blk-mq.  From Ming Lei
      
         - A fix for a blk-mq bug that could attempt to dereference a NULL rq
           if allocation failed
      
         - Two xen-blkfront small fixes
      
         - Cleanup of submit_bio_wait() type uses in the kernel, unifying
           that.  From Kent
      
         - A fix for 32-bit blkg_rwstat reading.  I apologize for this one
           looking mangled in the shortlog, it's entirely my fault for missing
           an empty line between the description and body of the text"
      
      * 'for-linus' of git://git.kernel.dk/linux-block:
        blk-mq: fix use-after-free of request
        blk-mq: fix dereference of rq->mq_ctx if allocation fails
        block: xen-blkfront: Fix possible NULL ptr dereference
        xen-blkfront: Silence pfn maybe-uninitialized warning
        block: submit_bio_wait() conversions
        Update of blkg_stat and blkg_rwstat may happen in bh context
      5ee54061
    • L
      Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 29be6345
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Trond Myklebust:
       - Stable fix for a NFSv4.1 delegation and state recovery deadlock
       - Stable fix for a loop on irrecoverable errors when returning
         delegations
       - Fix a 3-way deadlock between layoutreturn, open, and state recovery
       - Update the MAINTAINERS file with contact information for Trond
         Myklebust
       - Close needs to handle NFS4ERR_ADMIN_REVOKED
       - Enabling v4.2 should not recompile nfsd and lockd
       - Fix a couple of compile warnings
      
      * tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
        nfs: fix do_div() warning by instead using sector_div()
        MAINTAINERS: Update contact information for Trond Myklebust
        NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and state recovery
        SUNRPC: do not fail gss proc NULL calls with EACCES
        NFSv4: close needs to handle NFS4ERR_ADMIN_REVOKED
        NFSv4: Update list of irrecoverable errors on DELEGRETURN
        NFSv4 wait on recovery for async session errors
        NFS: Fix a warning in nfs_setsecurity
        NFS: Enabling v4.2 should not recompile nfsd and lockd
      29be6345
    • T
      ftrace: default to tilegx if ARCH=tile is specified · 2d8eedad
      Tony Lu 提交于
      This matches the existing behavior in arch/tile/Makefile for defconfig.
      
      Reported-by: fengguang.wu@intel.com
      Acked-by: NSteven Rostedt <rostedt@goodmis.org>
      Signed-off-by: NTony Lu <zlu@tilera.com>
      Signed-off-by: NChris Metcalf <cmetcalf@tilera.com>
      2d8eedad
    • S
      tracing: Only run synchronize_sched() at instance deletion time · 3ccb0123
      Steven Rostedt 提交于
      It has been reported that boot up with FTRACE_SELFTEST enabled can take a
      very long time. There can be stalls of over a minute.
      
      This was tracked down to the synchronize_sched() called when a system call
      event is disabled. As the self tests enable and disable thousands of events,
      this makes the synchronize_sched() get called thousands of times.
      
      The synchornize_sched() was added with d562aff9 "tracing: Add support
      for SOFT_DISABLE to syscall events" which caused this regression (added
      in 3.13-rc1).
      
      The synchronize_sched() is to protect against the events being accessed
      when a tracer instance is being deleted. When an instance is being deleted
      all the events associated to it are unregistered. The synchronize_sched()
      makes sure that no more users are running when it finishes.
      
      Instead of calling synchronize_sched() for all syscall events, we only
      need to call it once, after the events are unregistered and before the
      instance is deleted. The event_mutex is held during this action to
      prevent new users from enabling events.
      
      Link: http://lkml.kernel.org/r/20131203124120.427b9661@gandalf.local.homeReported-by: NPetr Mladek <pmladek@suse.cz>
      Acked-by: NTom Zanussi <tom.zanussi@linux.intel.com>
      Acked-by: NPetr Mladek <pmladek@suse.cz>
      Tested-by: NPetr Mladek <pmladek@suse.cz>
      Signed-off-by: NSteven Rostedt <rostedt@goodmis.org>
      3ccb0123
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · ef1e4e32
      Linus Torvalds 提交于
      Pull btrfs MAINTAINERS file update:
       "I'm still getting settled into new devel hardware etc, but I do have
        one commit for the next rc.
      
        This changes my email over to fb.com, and adds a MAINTAINERS entry for
        Josef as well"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: update the MAINTAINERS file
      ef1e4e32
    • 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
    • M
      blk-mq: fix use-after-free of request · 0d11e6ac
      Ming Lei 提交于
      If accounting is on, we will do the IO completion accounting after
      we have freed the request. Fix that by moving it sooner instead.
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      0d11e6ac
  4. 05 12月, 2013 12 次提交