Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Commits on Dec 6, 2013
  1. @torvalds

    Linux 3.13-rc3

    torvalds authored
  2. @torvalds

    Merge tag 'trace-fixes-3.13-rc2' of git://git.kernel.org/pub/scm/linu…

    torvalds authored
    …x/kernel/git/rostedt/linux-trace
    
    Pull tracing fix from Steven Rostedt:
     "A regression showed up that there's a large delay when enabling all
      events.  This was prevalent when FTRACE_SELFTEST was enabled which
      enables all events several times, and caused the system bootup to
      pause for over a minute.
    
      This was tracked down to an addition of a synchronize_sched()
      performed when system call tracepoints are unregistered.
    
      The synchronize_sched() is needed between the unregistering of the
      system call tracepoint and a deletion of a tracing instance buffer.
      But placing the synchronize_sched() in the unreg of *every* system
      call tracepoint is a bit overboard.  A single synchronize_sched()
      before the deletion of the instance is sufficient"
    
    * tag 'trace-fixes-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
      tracing: Only run synchronize_sched() at instance deletion time
  3. @torvalds

    Merge git://git.kvack.org/~bcrl/aio-next

    torvalds authored
    Pull aio fix from Benjamin LaHaise:
     "AIO fix from Gu Zheng that fixes a GPF that Dave Jones uncovered with
      trinity"
    
    * git://git.kvack.org/~bcrl/aio-next:
      aio: clean up aio ring in the fail path
  4. @torvalds

    Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g…

    torvalds authored
    …it/jejb/scsi
    
    Pull SCSI fixes from James Bottomley:
     "This is a set of nine fixes (and one author update).
    
      The libsas one should fix discovery in eSATA devices, the WRITE_SAME
      one is the largest, but it should fix a lot of problems we've been
      getting with the emulated RAID devices (they've been effectively lying
      about support and then firmware has been choking on the commands).
    
      The rest are various crash, hang or warn driver fixes"
    
    * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
      [SCSI] bfa: Fix crash when symb name set for offline vport
      [SCSI] enclosure: fix WARN_ON in dual path device removing
      [SCSI] pm80xx: Tasklets synchronization fix.
      [SCSI] pm80xx: Resetting the phy state.
      [SCSI] pm80xx: Fix for direct attached device.
      [SCSI] pm80xx: Module author addition
      [SCSI] hpsa: return 0 from driver probe function on success, not 1
      [SCSI] hpsa: do not discard scsi status on aborted commands
      [SCSI] Disable WRITE SAME for RAID and virtual host adapter drivers
      [SCSI] libsas: fix usage of ata_tf_to_fis
  5. @torvalds

    Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/jmorris/linux-security
    
    Pull IMA fixes from James Morris:
     "Here are two more fixes for IMA"
    
    * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
      ima: properly free ima_template_entry structures
      ima: Do not free 'entry' before it is initialized
  6. @torvalds

    Merge tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/k…

    torvalds authored
    …ernel/git/robh/linux
    
    Pull devicetree fixes from Rob Herring:
     - Various DT binding documentation updates
     - Add Kumar Gala and remove Stephen Warren as DT binding maintainers
    
    * tag 'dt-fixes-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
      dt: binding: reword PowerPC 8xxx GPIO documentation
      ARM: tegra: delete nvidia,tegra20-spi.txt binding
      hwmon: ntc_thermistor: Fix typo (pullup-uV -> pullup-uv)
      of: add vendor prefix for GMT
      clk: exynos: Fix typos in DT bindings documentation
      of: Add vendor prefix for LG Corporation
      Documentation: net: fsl-fec.txt: Add phy-supply entry
      ARM: dts: doc: Document missing binding for omap5-mpu
      dt-bindings: add ARMv8 PMU binding
      MAINTAINERS: remove swarren from DT bindings
      MAINTAINERS: Add Kumar to Device Tree Binding maintainers group
  7. @bcrl

    aio: clean up aio ring in the fail path

    Gu Zheng authored bcrl committed
    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/898
    
    Signed-off-by: Gu Zheng <guz.fnst@cn.fujitsu.com>
    Signed-off-by: Benjamin LaHaise <bcrl@kvack.org>
  8. Merge branch 'free-memory' of git://git.kernel.org/pub/scm/linux/kern…

    James Morris authored
    …el/git/zohar/linux-integrity into for-linus
  9. @torvalds

    Merge tag 'pm-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/…

    torvalds authored
    …git/rafael/linux-pm
    
    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
  10. Merge branches 'pm-epoll', 'pnp' and 'powercap'

    Rafael J. Wysocki authored
    * pm-epoll:
      epoll: drop EPOLLWAKEUP if PM_SLEEP is disabled
    
    * pnp:
      PNP: fix restoring devices after hibernation
    
    * powercap:
      PowerCap: Fix mode for energy counter
  11. Merge branches 'pm-cpuidle' and 'pm-cpufreq'

    Rafael J. Wysocki authored
    * 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
Commits on Dec 5, 2013
  1. @torvalds

    Merge branch 'stable' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/cmetcalf/linux-tile
    
    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
  2. @torvalds

    Merge branch 'for-linus' of git://git.kernel.dk/linux-block

    torvalds authored
    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
  3. @torvalds

    Merge tag 'nfs-for-3.13-3' of git://git.linux-nfs.org/projects/trondm…

    torvalds authored
    …y/linux-nfs
    
    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
  4. @cmetcalf-tilera

    ftrace: default to tilegx if ARCH=tile is specified

    Tony Lu authored cmetcalf-tilera committed
    This matches the existing behavior in arch/tile/Makefile for defconfig.
    
    Reported-by: fengguang.wu@intel.com
    Acked-by: Steven Rostedt <rostedt@goodmis.org>
    Signed-off-by: Tony Lu <zlu@tilera.com>
    Signed-off-by: Chris Metcalf <cmetcalf@tilera.com>
  5. @rostedt

    tracing: Only run synchronize_sched() at instance deletion time

    rostedt authored
    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 d562aff "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.home
    
    Reported-by: Petr Mladek <pmladek@suse.cz>
    Acked-by: Tom Zanussi <tom.zanussi@linux.intel.com>
    Acked-by: Petr Mladek <pmladek@suse.cz>
    Tested-by: Petr Mladek <pmladek@suse.cz>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
  6. @torvalds

    Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/gi…

    torvalds authored
    …t/mason/linux-btrfs
    
    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
  7. @torvalds

    Merge tag 'fbdev-fixes-3.13' of git://git.kernel.org/pub/scm/linux/ke…

    torvalds authored
    …rnel/git/tomba/linux
    
    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
  8. @torvalds

    Merge tag 'sound-3.13-rc3' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds authored
    …el/git/tiwai/sound
    
    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()
      ...
  9. @torvalds

    Merge tag 'pinctrl-v3.13-2' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds authored
    …nel/git/linusw/linux-pinctrl
    
    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
  10. @ming1 @axboe

    blk-mq: fix use-after-free of request

    ming1 authored axboe committed
    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: Jens Axboe <axboe@kernel.dk>
  11. @torvalds

    Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kerne…

    torvalds authored
    …l/git/tip/tip
    
    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
  12. x86/apic, doc: Justification for disabling IO APIC before Local APIC

    Fenghua Yu authored H. Peter Anvin committed
    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:
    
    522e664 x86/apic: Disable I/O APIC before shutdown of the local APIC
    
    Signed-off-by: Fenghua Yu <fenghua.yu@intel.com>
    Link: http://lkml.kernel.org/r/1386202069-51515-1-git-send-email-fenghua.yu@intel.com
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
  13. PowerCap: Fix mode for energy counter

    Srinivas Pandruvada authored Rafael J. Wysocki committed
    As per the documentation of powercap sysfs, energy_uj field is read only,
    if it can't be reset. Currently it always allows write but will fail,
    if there is no reset callback.
    Changing mode field, to read only if there is no reset callback.
    
    Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
    Reported-by: Dirk Brandewie <dirk.j.brandewie@intel.com>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
  14. @dtor

    PNP: fix restoring devices after hibernation

    dtor authored Rafael J. Wysocki committed
    On returning from hibernation 'restore' callback is called,
    not 'resume'.  Fix it.
    
    Fixes: eaf140b (PNP: convert PNP driver bus legacy pm_ops to dev_pm_ops)
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Cc: 3.12+ <stable@vger.kernel.org> # 3.12+
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Commits on Dec 4, 2013
  1. x86, bitops: Correct the assembly constraints to testing bitops

    H. Peter Anvin authored
    In checkin:
    
    0c44c2d 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: Jesse Brandeburg <jesse.brandeburg@intel.com>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    Cc: Peter Zijlstra <peterz@infradead.org>
    Link: http://lkml.kernel.org/r/529E8719.4070202@zytor.com
  2. nfs: fix do_div() warning by instead using sector_div()

    Helge Deller authored Trond Myklebust committed
    When compiling a 32bit kernel with CONFIG_LBDAF=n the compiler complains like
    shown below.  Fix this warning by instead using sector_div() which is provided
    by the kernel.h header file.
    
    fs/nfs/blocklayout/extents.c: In function ‘normalize’:
    include/asm-generic/div64.h:43:28: warning: comparison of distinct pointer types lacks a cast [enabled by default]
    fs/nfs/blocklayout/extents.c:47:13: note: in expansion of macro ‘do_div’
    nfs/blocklayout/extents.c:47:2: warning: right shift count >= width of type [enabled by default]
    fs/nfs/blocklayout/extents.c:47:2: warning: passing argument 1 of ‘__div64_32’ from incompatible pointer type [enabled by default]
    include/asm-generic/div64.h:35:17: note: expected ‘uint64_t *’ but argument is of type ‘sector_t *’
     extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor);
    
    Signed-off-by: Helge Deller <deller@gmx.de>
    Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
  3. MAINTAINERS: Update contact information for Trond Myklebust

    Trond Myklebust authored
    Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
  4. NFSv4.1: Prevent a 3-way deadlock between layoutreturn, open and stat…

    Trond Myklebust authored
    …e recovery
    
    Andy Adamson reports:
    
    The state manager is recovering expired state and recovery OPENs are being
    processed. If kswapd is pruning inodes at the same time, a deadlock can occur
    when kswapd calls evict_inode on an NFSv4.1 inode with a layout, and the
    resultant layoutreturn gets an error that the state mangager is to handle,
    causing the layoutreturn to wait on the (NFS client) cl_rpcwaitq.
    
    At the same time an open is waiting for the inode deletion to complete in
    __wait_on_freeing_inode.
    
    If the open is either the open called by the state manager, or an open from
    the same open owner that is holding the NFSv4 sequence id which causes the
    OPEN from the state manager to wait for the sequence id on the Seqid_waitqueue,
    then the state is deadlocked with kswapd.
    
    The fix is simply to have layoutreturn ignore all errors except NFS4ERR_DELAY.
    We already know that layouts are dropped on all server reboots, and that
    it has to be coded to deal with the "forgetful client model" that doesn't
    send layoutreturns.
    
    Reported-by: Andy Adamson <andros@netapp.com>
    Link: http://lkml.kernel.org/r/1385402270-14284-1-git-send-email-andros@netapp.com
    Signed-off-by: Trond Myklebust <Trond.Myklebust@primarydata.com>
  5. @torvalds

    Merge tag 'gpio-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel…

    torvalds authored
    …/git/linusw/linux-gpio
    
    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
  6. @torvalds

    Merge tag 'fixes-for-linus' of git://git.kernel.org/pub/scm/linux/ker…

    torvalds authored
    …nel/git/arm/arm-soc
    
    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
      ...
  7. @torvalds

    Merge branch 'parisc-3.13' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds authored
    …el/git/deller/parisc-linux
    
    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 5ecbe3c -
       "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
  8. @torvalds

    Merge tag 'squashfs-fixes' of git://git.kernel.org/pub/scm/linux/kern…

    torvalds authored
    …el/git/pkl/squashfs-next
    
    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
  9. @torvalds

    Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

    torvalds authored
    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
  10. @torvalds

    Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/sc…

    torvalds authored
    …m/linux/kernel/git/tip/tip
    
    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
Something went wrong with that request. Please try again.