1. 02 Mar, 2013 18 commits
    • Linus Torvalds's avatar
      Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 426d266c
      Linus Torvalds authored
      Pull SCSI updates from James Bottomley:
       "This is an assorted set of stragglers into the merge window with
        driver updates for qla2xxx, megaraid_sas, storvsc and ufs.
      
        It also includes pulls of the uapi tree (all the remaining SCSI
        pieces) and the fcoe tree (updates to fcoe and libfc)"
      
      * tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (81 commits)
        [SCSI] ufs: Separate PCI code into glue driver
        [SCSI] ufs: Segregate PCI Specific Code
        [SCSI] scsi: fix lpfc build when wmb() is defined as mb()
        [SCSI] storvsc: Handle dynamic resizing of the device
        [SCSI] storvsc: Restructure error handling code on command completion
        [SCSI] storvsc: avoid usage of WRITE_SAME
        [SCSI] aacraid: suppress two GCC warnings
        [SCSI] hpsa: check for dma_mapping_error in hpsa_passthru ioctls
        [SCSI] hpsa: reorganize error handling in hpsa_passthru_ioctl
        [SCSI] hpsa: check for dma_mapping_error in hpsa_map_sg_chain_block
        [SCSI] hpsa: Check for dma_mapping_error for all code paths using fill_cmd
        [SCSI] hpsa: Check for dma_mapping_error in hpsa_map_one
        [SCSI] dc395x: uninitialized variable in device_alloc()
        [SCSI] Fix range check in scsi_host_dif_capable()
        [SCSI] storvsc: Initialize the sglist
        [SCSI] mpt2sas: Add support for OEM specific controller
        [SCSI] ipr: Fix oops while resetting an ipr adapter
        [SCSI] fnic: Fnic Trace Utility
        [SCSI] fnic: New debug flags and debug log messages
        [SCSI] fnic: fnic driver may hit BUG_ON on device reset
        ...
      426d266c
    • Yinghai Lu's avatar
      x86, ACPI, mm: Revert movablemem_map support · 20e6926d
      Yinghai Lu authored
      Tim found:
      
        WARNING: at arch/x86/kernel/smpboot.c:324 topology_sane.isra.2+0x6f/0x80()
        Hardware name: S2600CP
        sched: CPU #1's llc-sibling CPU #0 is not on the same node! [node: 1 != 0]. Ignoring dependency.
        smpboot: Booting Node   1, Processors  #1
        Modules linked in:
        Pid: 0, comm: swapper/1 Not tainted 3.9.0-0-generic #1
        Call Trace:
          set_cpu_sibling_map+0x279/0x449
          start_secondary+0x11d/0x1e5
      
      Don Morris reproduced on a HP z620 workstation, and bisected it to
      commit e8d19552 ("acpi, memory-hotplug: parse SRAT before memblock
      is ready")
      
      It turns out movable_map has some problems, and it breaks several things
      
      1. numa_init is called several times, NOT just for srat. so those
      	nodes_clear(numa_nodes_parsed)
      	memset(&numa_meminfo, 0, sizeof(numa_meminfo))
         can not be just removed.  Need to consider sequence is: numaq, srat, amd, dummy.
         and make fall back path working.
      
      2. simply split acpi_numa_init to early_parse_srat.
         a. that early_parse_srat is NOT called for ia64, so you break ia64.
         b.  for (i = 0; i < MAX_LOCAL_APIC; i++)
      	     set_apicid_to_node(i, NUMA_NO_NODE)
           still left in numa_init. So it will just clear result from early_parse_srat.
           it should be moved before that....
         c.  it breaks ACPI_TABLE_OVERIDE...as the acpi table scan is moved
             early before override from INITRD is settled.
      
      3. that patch TITLE is total misleading, there is NO x86 in the title,
         but it changes critical x86 code. It caused x86 guys did not
         pay attention to find the problem early. Those patches really should
         be routed via tip/x86/mm.
      
      4. after that commit, following range can not use movable ram:
        a. real_mode code.... well..funny, legacy Node0 [0,1M) could be hot-removed?
        b. initrd... it will be freed after booting, so it could be on movable...
        c. crashkernel for kdump...: looks like we can not put kdump kernel above 4G
      	anymore.
        d. init_mem_mapping: can not put page table high anymore.
        e. initmem_init: vmemmap can not be high local node anymore. That is
           not good.
      
      If node is hotplugable, the mem related range like page table and
      vmemmap could be on the that node without problem and should be on that
      node.
      
      We have workaround patch that could fix some problems, but some can not
      be fixed.
      
      So just remove that offending commit and related ones including:
      
       f7210e6c ("mm/memblock.c: use CONFIG_HAVE_MEMBLOCK_NODE_MAP to
          protect movablecore_map in memblock_overlaps_region().")
      
       01a178a9 ("acpi, memory-hotplug: support getting hotplug info from
          SRAT")
      
       27168d38 ("acpi, memory-hotplug: extend movablemem_map ranges to
          the end of node")
      
       e8d19552 ("acpi, memory-hotplug: parse SRAT before memblock is
          ready")
      
       fb06bc8e ("page_alloc: bootmem limit with movablecore_map")
      
       42f47e27 ("page_alloc: make movablemem_map have higher priority")
      
       6981ec31 ("page_alloc: introduce zone_movable_limit[] to keep
          movable limit for nodes")
      
       34b71f1e ("page_alloc: add movable_memmap kernel parameter")
      
       4d59a751 ("x86: get pg_data_t's memory from other node")
      
      Later we should have patches that will make sure kernel put page table
      and vmemmap on local node ram instead of push them down to node0.  Also
      need to find way to put other kernel used ram to local node ram.
      Reported-by: default avatarTim Gardner <tim.gardner@canonical.com>
      Reported-by: default avatarDon Morris <don.morris@hp.com>
      Bisected-by: default avatarDon Morris <don.morris@hp.com>
      Tested-by: default avatarDon Morris <don.morris@hp.com>
      Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
      Cc: Tony Luck <tony.luck@intel.com>
      Cc: Thomas Renninger <trenn@suse.de>
      Cc: Tejun Heo <tj@kernel.org>
      Cc: Tang Chen <tangchen@cn.fujitsu.com>
      Cc: Yasuaki Ishimatsu <isimatu.yasuaki@jp.fujitsu.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      20e6926d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal · 14cc0b55
      Linus Torvalds authored
      Pull signal/compat fixes from Al Viro:
       "Fixes for several regressions introduced in the last signal.git pile,
        along with fixing bugs in truncate and ftruncate compat (on just about
        anything biarch at least one of those two had been done wrong)."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
        compat: restore timerfd settime and gettime compat syscalls
        [regression] braino in "sparc: convert to ksignal"
        fix compat truncate/ftruncate
        switch lseek to COMPAT_SYSCALL_DEFINE
        lseek() and truncate() on sparc really need sign extension
      14cc0b55
    • Linus Torvalds's avatar
      Merge tag 'for_linux-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb · 3cfb0774
      Linus Torvalds authored
      Pull KGDB/KDB fixes and cleanups from Jason Wessel:
       "For a change we removed more code than we added.  If people aren't
        using it we shouldn't be carrying it.  :-)
      
        Cleanups:
         - Remove kdb ssb command - there is no in kernel disassembler to
           support it
      
         - Remove kdb ll command - Always caused a kernel oops and there were
           no bug reports so no one was using this command
      
         - Use kernel ARRAY_SIZE macro instead of array computations
      
        Fixes:
         - Stop oops in kdb if user executes kdb_defcmd with args
      
         - kdb help command truncated text
      
         - ppc64 support for kgdbts
      
         - Add missing kconfig option from original kdb port for dealing with
           catastrophic kernel crashes such that you can reboot automatically
           on continue from kdb"
      
      * tag 'for_linux-3.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb:
        kdb: Remove unhandled ssb command
        kdb: Prevent kernel oops with kdb_defcmd
        kdb: Remove the ll command
        kdb_main: fix help print
        kdb: Fix overlap in buffers with strcpy
        Fixed dead ifdef block by adding missing Kconfig option.
        kdb: Setup basic kdb state before invoking commands via kgdb
        kdb: use ARRAY_SIZE where possible
        kgdb/kgdbts: support ppc64
        kdb: A fix for kdb command table expansion
      3cfb0774
    • Linus Torvalds's avatar
      Merge tag 'arc-v3.9-rc1-late' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc · e23b6225
      Linus Torvalds authored
      Pull new ARC architecture from Vineet Gupta:
       "Initial ARC Linux port with some fixes on top for 3.9-rc1:
      
        I would like to introduce the Linux port to ARC Processors (from
        Synopsys) for 3.9-rc1.  The patch-set has been discussed on the public
        lists since Nov and has received a fair bit of review, specially from
        Arnd, tglx, Al and other subsystem maintainers for DeviceTree, kgdb...
      
        The arch bits are in arch/arc, some asm-generic changes (acked by
        Arnd), a minor change to PARISC (acked by Helge).
      
        The series is a touch bigger for a new port for 2 main reasons:
      
         1. It enables a basic kernel in first sub-series and adds
            ptrace/kgdb/.. later
      
         2. Some of the fallout of review (DeviceTree support, multi-platform-
            image support) were added on top of orig series, primarily to
            record the revision history.
      
        This updated pull request additionally contains
      
         - fixes due to our GNU tools catching up with the new syscall/ptrace
           ABI
      
         - some (minor) cross-arch Kconfig updates."
      
      * tag 'arc-v3.9-rc1-late' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: (82 commits)
        ARC: split elf.h into uapi and export it for userspace
        ARC: Fixup the current ABI version
        ARC: gdbserver using regset interface possibly broken
        ARC: Kconfig cleanup tracking cross-arch Kconfig pruning in merge window
        ARC: make a copy of flat DT
        ARC: [plat-arcfpga] DT arc-uart bindings change: "baud" => "current-speed"
        ARC: Ensure CONFIG_VIRT_TO_BUS is not enabled
        ARC: Fix pt_orig_r8 access
        ARC: [3.9] Fallout of hlist iterator update
        ARC: 64bit RTSC timestamp hardware issue
        ARC: Don't fiddle with non-existent caches
        ARC: Add self to MAINTAINERS
        ARC: Provide a default serial.h for uart drivers needing BASE_BAUD
        ARC: [plat-arcfpga] defconfig for fully loaded ARC Linux
        ARC: [Review] Multi-platform image #8: platform registers SMP callbacks
        ARC: [Review] Multi-platform image #7: SMP common code to use callbacks
        ARC: [Review] Multi-platform image #6: cpu-to-dma-addr optional
        ARC: [Review] Multi-platform image #5: NR_IRQS defined by ARC core
        ARC: [Review] Multi-platform image #4: Isolate platform headers
        ARC: [Review] Multi-platform image #3: switch to board callback
        ...
      e23b6225
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · aebb2afd
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
      
       o Add basic support for the Mediatek/Ralink Wireless SoC family.
      
       o The Qualcomm Atheros platform is extended by support for the new
         QCA955X SoC series as well as a bunch of patches that get the code
         ready for OF support.
      
       o Lantiq and BCM47XX platform have a few improvements and bug fixes.
      
       o MIPS has sent a few patches that get the kernel ready for the
         upcoming microMIPS support.
      
       o The rest of the series is made up of small bug fixes and cleanups
         that relate to various parts of the MIPS code.  The biggy in there is
         a whitespace cleanup.  After I was sent another set of whitespace
         cleanup patches I decided it was the time to clean the whitespace
         "issues" for once and and that touches many files below arch/mips/.
      
      Fix up silly conflicts, mostly due to whitespace cleanups.
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (105 commits)
        MIPS: Quit exporting kernel internel break codes to uapi/asm/break.h
        MIPS: remove broken conditional inside vpe loader code
        MIPS: SMTC: fix implicit declaration of set_vi_handler
        MIPS: early_printk: drop __init annotations
        MIPS: Probe for and report hardware virtualization support.
        MIPS: ath79: add support for the Qualcomm Atheros AP136-010 board
        MIPS: ath79: add USB controller registration code for the QCA955X SoCs
        MIPS: ath79: add PCI controller registration code for the QCA955X SoCs
        MIPS: ath79: add WMAC registration code for the QCA955X SoCs
        MIPS: ath79: register UART for the QCA955X SoCs
        MIPS: ath79: add QCA955X specific glue to ath79_device_reset_{set, clear}
        MIPS: ath79: add GPIO setup code for the QCA955X SoCs
        MIPS: ath79: add IRQ handling code for the QCA955X SoCs
        MIPS: ath79: add clock setup code for the QCA955X SoCs
        MIPS: ath79: add SoC detection code for the QCA955X SoCs
        MIPS: ath79: add early printk support for the QCA955X SoCs
        MIPS: ath79: fix WMAC IRQ resource assignment
        mips: reserve elfcorehdr
        mips: Make sure kernel memory is in iomem
        MIPS: ath79: use dynamically allocated USB platform devices
        ...
      aebb2afd
    • Vincent's avatar
      kdb: Remove unhandled ssb command · 36dfea42
      Vincent authored
      The 'ssb' command can only be handled when we have a disassembler, to check for
      branches, so remove the 'ssb' command for now.
      Signed-off-by: default avatarVincent Stehlé <vincent.stehle@laposte.net>
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      36dfea42
    • Jason Wessel's avatar
      kdb: Prevent kernel oops with kdb_defcmd · a37372f6
      Jason Wessel authored
      The kdb_defcmd can only be used to display the available command aliases
      while using the kernel debug shell.  If you try to define a new macro
      while the kernel debugger is active it will oops.  The debug shell
      macros must use pre-allocated memory set aside at the time kdb_init()
      is run, and the kdb_defcmd is restricted to only working at the time
      that the kdb_init sequence is being run, which only occurs if you
      actually activate the kernel debugger.
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      a37372f6
    • Jason Wessel's avatar
      kdb: Remove the ll command · 1b2caa2d
      Jason Wessel authored
      Recently some code inspection was done after fixing a problem with
      kmalloc used while in the kernel debugger context (which is not
      legal), and it turned up the fact that kdb ll command will oops the
      kernel.
      
      Given that there have been zero bug reports on the command combined
      with the fact it will oops the kernel it is clearly not being used.
      Instead of fixing it, it will be removed.
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      1b2caa2d
    • Jason Wessel's avatar
      kdb_main: fix help print · 074604af
      Jason Wessel authored
      The help command was chopping all the usage instructions such that
      they were not readable.
      
      Example:
      
      bta             [D|R|S|T|C|Z|E|U|I| Backtrace all processes matching state flag
      per_cpu         <sym> [<bytes>] [<c Display per_cpu variables
      
      Where as it should look like:
      
      bta             [D|R|S|T|C|Z|E|U|I|M|A]
                                          Backtrace all processes matching state flag
      per_cpu         <sym> [<bytes>] [<cpu>]
                                          Display per_cpu variables
      
      All that is needed is to check the how long the cmd_usage is and jump
      to the next line when appropriate.
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      074604af
    • Jason Wessel's avatar
      kdb: Fix overlap in buffers with strcpy · 4eb7a66d
      Jason Wessel authored
      Maxime reported that strcpy(s->usage, s->usage+1) has no definitive
      guarantee that it will work on all archs the same way when you have
      overlapping memory.  The fix is simple for the kdb code because we
      still have the original string memory in the function scope, so we
      just have to use that as the argument instead.
      Reported-by: default avatarMaxime Villard <rustyBSD@gmx.fr>
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      4eb7a66d
    • Robert Obermeier's avatar
      Fixed dead ifdef block by adding missing Kconfig option. · 3b0eb71e
      Robert Obermeier authored
      Added missing Kconfig option KDB_CONTINUE_CATASTROPHIC which lead to a dead
      ifdef block in kernel/debug/kdb/kdb_main.c:73-75.
      
      The code using KDB_CONTINUE_CATASTROPHIC was originally introduced in
      commit '5d5314d6' by Jason Wessel.
      This patchset ("kdb: core for kgdb back end (1 of 2)")
      added platform independent part of kdb to the linux kernel.
      
      The Kernel option however, even though it had the same options and
      behaviour on all supported architectures, was part of the x86 and
      ia64 patchset of KDB and therefore not pulled into the mainline kernel tree.
      
      I actually took the originally written Kconfig by
      Keith Owens <kaos@sgi.com> (2003-06-20 according to KDB changelog)
      and changed it to reflect the correct behaviour,
      as the KDUMP patchset is not part of the kernel and the expected
      functionality is missing from it.
      Signed-off-by: default avatarRobert Obermeier <obbi89@googlemail.com>
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      3b0eb71e
    • Matt Klein's avatar
      kdb: Setup basic kdb state before invoking commands via kgdb · 00370b8f
      Matt Klein authored
      Although invasive kdb commands are not supported via kgdb, some useful
      non-invasive commands like bt* require basic kdb state to be setup before
      calling into the kdb code. Factor out some of this code and call it before
      and after executing kdb commands via kgdb.
      Signed-off-by: default avatarMatt Klein <mklein@twitter.com>
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      00370b8f
    • Sasha Levin's avatar
      5f784f79
    • Tiejun Chen's avatar
      kgdb/kgdbts: support ppc64 · e78acf67
      Tiejun Chen authored
      We can't look up the address of the entry point of the function simply
      via that function symbol for all architectures.
      
      For PPC64 ABI, actually there is a function descriptors structure.
      
      A function descriptor is a three doubleword data structure that contains
      the following values:
      	* The first doubleword contains the address of the entry point of
      		the function.
      	* The second doubleword contains the TOC base address for
      		the function.
      	* The third doubleword contains the environment pointer for
      		languages such as Pascal and PL/1.
      
      So we should call a wapperred dereference_function_descriptor() to get
      the address of the entry point of the function.
      
      Note this is also safe for other architecture after refer to
      "include/asm-generic/sections.h" since:
      
      dereference_function_descriptor(p) always is (p) if without arched definition.
      Signed-off-by: default avatarTiejun Chen <tiejun.chen@windriver.com>
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      e78acf67
    • John Blackwood's avatar
      kdb: A fix for kdb command table expansion · f7c82d5a
      John Blackwood authored
      When locally adding in some additional kdb commands, I stumbled
      across an issue with the dynamic expansion of the kdb command table.
      When the number of kdb commands exceeds the size of the statically
      allocated kdb_base_commands[] array, additional space is allocated in
      the kdb_register_repeat() routine.
      
      The unused portion of the newly allocated array was not being initialized
      to zero properly and this would result in segfaults when help '?' was
      executed or when a search for a non-existing command would traverse the
      command table beyond the end of valid command entries and then attempt
      to use the non-zeroed area as actual command entries.
      Signed-off-by: default avatarJohn Blackwood <john.blackwood@ccur.com>
      Signed-off-by: default avatarJason Wessel <jason.wessel@windriver.com>
      f7c82d5a
    • Heiko Carstens's avatar
      compat: restore timerfd settime and gettime compat syscalls · 0e803baf
      Heiko Carstens authored
      Both compat syscalls got lost with 9d94b9e2 "switch timerfd compat syscalls
      to COMPAT_SYSCALL_DEFINE" because of a typo:
      COMPAT instead of CONFIG_COMPAT.
      Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
      0e803baf
    • Al Viro's avatar
      dfbb83d3
  2. 01 Mar, 2013 17 commits
    • Randy Dunlap's avatar
      hsi: fix kernel-doc warnings · 8eae508b
      Randy Dunlap authored
      Fix kernel-doc warnings in hsi files:
      
        Warning(include/linux/hsi/hsi.h:136): Excess struct/union/enum/typedef member 'e_handler' description in 'hsi_client'
        Warning(include/linux/hsi/hsi.h:136): Excess struct/union/enum/typedef member 'pclaimed' description in 'hsi_client'
        Warning(include/linux/hsi/hsi.h:136): Excess struct/union/enum/typedef member 'nb' description in 'hsi_client'
        Warning(drivers/hsi/hsi.c:434): No description found for parameter 'handler'
        Warning(drivers/hsi/hsi.c:434): Excess function parameter 'cb' description in 'hsi_register_port_event'
      
      Don't document "private:" fields with kernel-doc notation.
      If you want to leave them fully documented, that's OK, but
      then don't mark them as "private:".
      Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
      Cc: Carlos Chinea <carlos.chinea@nokia.com>
      Cc: Linus Walleij <linus.walleij@linaro.org>
      Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
      Cc: linux-kernel@vger.kernel.org
      Cc: linux-omap@vger.kernel.org
      Acked-by: default avatarNishanth Menon <nm@ti.com>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      8eae508b
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6 · cc73dc04
      Linus Torvalds authored
      Pull CIFS fixes from Steve French:
       "Four cifs fixes (including for kernel bug #53221 and samba bug #9519)"
      
      * 'for-next' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: bugfix for unreclaimed writeback pages in cifs_writev_requeue()
        cifs: set MAY_SIGN when sec=krb5
        POSIX extensions disabled on client due to illegal O_EXCL flag sent to Samba
        cifs: ensure that cifs_get_root() only traverses directories
      cc73dc04
    • Tim Gardner's avatar
      autofs4 - autofs4_catatonic_mode(): remove redundant null check on kfree() · 5140a8ce
      Tim Gardner authored
      smatch analysis:
      
        fs/autofs4/waitq.c:46 autofs4_catatonic_mode() info: redundant null check on wq->name.name calling kfree()
      Signed-off-by: default avatarTim Gardner <tim.gardner@canonical.com>
      Signed-off-by: default avatarIan Kent <raven@themaw.net>
      Cc: autofs@vger.kernel.org
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5140a8ce
    • Peter Huewe's avatar
      autofs - Fix sparse warning: context imbalance in autofs4_d_automount()... · 9d8072e7
      Peter Huewe authored
      autofs - Fix sparse warning: context imbalance in autofs4_d_automount() different lock contexts for basic block
      
      Sparse complains:
      
        fs/autofs4/root.c:409:9: sparse: context imbalance in 'autofs4_d_automount' - different lock contexts for basic block
      
      This was introduced by commit f55fb0c2 ("autofs4 - dont clear
      DCACHE_NEED_AUTOMOUNT on rootless mount")
      
      The function autofs4_d_automount can be left with the (&sbi->fs_lock)
      held if sbi->version <= 4 and simple_empty(dentry) == false so the
      warning seems valid.
      
      --> Add an spin_unlock in this case before we jump to done
      
      Unfortunately compile tested only.
      Reported-by: default avatarFengguang Wu <fengguang.wu@intel.com>
      Signed-off-by: default avatarPeter Huewe <peterhuewe@gmx.de>
      Acked-by: default avatarIan Kent <raven@themaw.net>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      9d8072e7
    • James Bottomley's avatar
      [SCSI] Merge tag 'fcoe-02-19-13' into for-linus · 3e34c1fc
      James Bottomley authored
      FCoE Updates for 3.9
      Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
      3e34c1fc
    • James Bottomley's avatar
      Merge tag 'uapi-20121219' into for-linus · c157750a
      James Bottomley authored
      UAPI Disintegration 2012-12-19
      
      This is the remaining SCSI part of the UAPI
      Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
      c157750a
    • Linus Torvalds's avatar
      Merge tag 'lzo-update-signature-20130226' of git://github.com/markus-oberhumer/linux · b0af9cd9
      Linus Torvalds authored
      Pull LZO compression update from Markus Oberhumer:
       "Summary:
        ========
      
        Update the Linux kernel LZO compression and decompression code to the
        current upstream version which features significant performance
        improvements on modern machines.
      
        Some *synthetic* benchmarks:
        ============================
      
          x86_64 (Sandy Bridge), gcc-4.6 -O3, Silesia test corpus, 256 kB block-size:
      
                           compression speed   decompression speed
      
          LZO-2005    :         150 MB/sec          468 MB/sec
          LZO-2012    :         434 MB/sec         1210 MB/sec
      
          i386 (Sandy Bridge), gcc-4.6 -O3, Silesia test corpus, 256 kB block-size:
      
                           compression speed   decompression speed
      
          LZO-2005    :         143 MB/sec          409 MB/sec
          LZO-2012    :         372 MB/sec         1121 MB/sec
      
          armv7 (Cortex-A9), Linaro gcc-4.6 -O3, Silesia test corpus, 256 kB block-size:
      
                           compression speed   decompression speed
      
          LZO-2005    :          27 MB/sec           84 MB/sec
          LZO-2012    :          44 MB/sec          117 MB/sec
        **LZO-2013-UA :          47 MB/sec          167 MB/sec
      
        Legend:
      
          LZO-2005    : LZO version in current 3.8 kernel (which is based on
                           the LZO 2.02 release from 2005)
          LZO-2012    : updated LZO version available in linux-next
        **LZO-2013-UA : updated LZO version available in linux-next plus experimental
                           ARM Unaligned Access patch. This needs approval
                           from some ARM maintainer ist NOT YET INCLUDED."
      
      Andrew Morton <akpm@linux-foundation.org> acks it and says:
       "There's a new LZ4 on the block which is even faster than the sped-up
        LZO, but various filesystems and things use LZO"
      
      * tag 'lzo-update-signature-20130226' of git://github.com/markus-oberhumer/linux:
        crypto: testmgr - update LZO compression test vectors
        lib/lzo: Update LZO compression to current upstream version
        lib/lzo: Rename lzo1x_decompress.c to lzo1x_decompress_safe.c
      b0af9cd9
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/virt/kvm/kvm · 1e500597
      Linus Torvalds authored
      Pull one kvm bugfix from Gleb Natapov.
      
      * git://git.kernel.org/pub/scm/virt/kvm/kvm:
        x86/kvm: Fix pvclock vsyscall fixmap
      1e500597
    • Linus Torvalds's avatar
      Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac · ad6c2c2e
      Linus Torvalds authored
      Pull EDAC fixes and ghes-edac from Mauro Carvalho Chehab:
       "For:
      
         - Some fixes at edac drivers (i7core_edac, sb_edac, i3200_edac);
         - error injection support for i5100, when EDAC debug is enabled;
         - fix edac when it is loaded builtin (early init for the subsystem);
         - a "Firmware First" EDAC driver, allowing ghes to report errors via
           EDAC (ghes-edac).
      
        With regards to ghes-edac, this fixes a longstanding BZ at Red Hat
        that happens with Nehalem and Sandy Bridge CPUs: when both GHES and
        i7core_edac or sb_edac are running, the error reports are
        unpredictable, as both BIOS and OS race to access the registers.  With
        ghes-edac, the EDAC core will refuse to register any other concurrent
        memory error driver.
      
        This patchset moves the ghes struct definitions to a separate header
        file (include/acpi/ghes.h) and adds 3 hooks at apei/ghes.c to
        register/unregister and to report errors via ghes-edac.  Those changes
        were acked by ghes driver maintainer (Huang)."
      
      * 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (30 commits)
        i5100_edac: convert to use simple_open()
        ghes_edac: fix to use list_for_each_entry_safe() when delete list items
        ghes_edac: Fix RAS tracing
        ghes_edac: Make it compliant with UEFI spec 2.3.1
        ghes_edac: Improve driver's printk messages
        ghes_edac: Don't credit the same memory dimm twice
        ghes_edac: do a better job of filling EDAC DIMM info
        ghes_edac: add support for reporting errors via EDAC
        ghes_edac: Register at EDAC core the BIOS report
        ghes: add the needed hooks for EDAC error report
        ghes: move structures/enum to a header file
        edac: add support for error type "Info"
        edac: add support for raw error reports
        edac: reduce stack pressure by using a pre-allocated buffer
        edac: lock module owner to avoid error report conflicts
        edac: remove proc_name from mci structure
        edac: add a new memory layer type
        edac: initialize the core earlier
        edac: better report error conditions in debug mode
        i5100_edac: Remove two checkpatch warnings
        ...
      ad6c2c2e
    • Linus Torvalds's avatar
      Fix mis-merge of intel_powerclamp.c resulting in compile error · 19cc90f5
      Linus Torvalds authored
      The new intel_powerclamp thermal cooling device driver was merged in
      commit 2af78448 (Pull thermal management updates from Zhang Rui)
      without any data conflicts.  But there was a more subtle conflict I
      missed: the driver uses MAX_USER_RT_PRIO, but commit 8bd75c77
      ("sched/rt: Move rt specific bits into new header file") had moved that
      define from <linux/sched.h> to <linux/sched/rt.h>.
      
      Which caused this build failure:
      
        drivers/thermal/intel_powerclamp.c: In function ‘clamp_thread’:
        drivers/thermal/intel_powerclamp.c:360:21: error: ‘MAX_USER_RT_PRIO’ undeclared (first use in this function)
        drivers/thermal/intel_powerclamp.c:360:21: note: each undeclared identifier is reported only once for each function it appears in
      
      And because I don't do a full "make allmodconfig" build after each pull,
      I didn't notice until too late.  So now the fix is here, separately from
      the merge commit.
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      19cc90f5
    • Linus Torvalds's avatar
      Merge tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 1a32c58b
      Linus Torvalds authored
      Pull ARM SoC mvebu platform changes from Olof Johansson:
       "This series contains changes for the Marvell EBU platforms (mvebu,
        orion, kirkwood, dove) that were not part of the first set of pull
        requests because of dependencies on the MMC tree, and being submitted
        a little late.
      
        Notable changes are:
      
         - More devices get moved out of board files into device tree
           descriptions.  The remaining devices listed in there have patches
           that will get sent for 3.10, after which we can remove a lot of the
           board files entirely.  We are doing the pinctrl and mmc drivers
           here, ethernet and PCI still remain.
      
         - SMP support for mvebu is improved with support for the local
           interrupt controller.
      
         - The Guruplug board file gets replaced with a DT description.
      
        Unfortunately, the dependency on the MMC tree turned out to be a much
        larger problem than expected, when the MMC maintainer rebased the
        patches in his tree that all of the patches in this branch are based
        on, which caused merge conflicts between the new and old versions of
        those patches.
      
        To work around the merge conflicts, this branch rebases all patches on
        top of the respective MMC patches that did get merged into 3.9.  The
        patches are all identical to the versions that were part of
        linux-next, but have a new commit date."
      
      * tag 'late-mvebu-rebased' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (90 commits)
        arm: mvebu: enable the SD card slot on Armada 370 Reference Design board
        ARM: kirkwood: topkick: init mvsdio via DT
        ARM: kirkwood: nsa310: convert to pinctrl
        ARM: Kirkwood: topkick: Enable i2c bus.
        ARM: kirkwood: topkick: convert to pinctrl
        ARM: dove: convert serial DT nodes to clocks property
        arm: mvebu: Add SPI flash on Armada 370 DB board
        arm: mvebu: Add SPI flash on Armada XP-DB board
        arm: mvebu: Add SPI flash on Armada XP-GP board
        arm: mvebu: Add support for SPI controller in Armada 370/XP
        clocksource: update and move armada-370-xp-timer documentation to timer directory
        arm: mvebu: update DT to support local timers
        ARM: Dove: convert usb host controller to DT
        arm: mvebu: Enable USB controllers on Armada 370/XP boards
        arm: mvebu: Add support for USB host controllers in Armada 370/XP
        arm: mvebu: add button for OpenBlocks AX3-4
        ARM: Kirkwood: Convert NS2 to gpio-poweroff.
        ARM: Kirkwood: Convert NSA310 I2C to device tree
        ARM: Kirkwood: Convert NSA310 to use gpio-poweroff driver
        ARM: Kirkwood: Convert NSA310 to DT based regulators.
        ...
      1a32c58b
    • Linus Torvalds's avatar
      Merge tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · 7307c00f
      Linus Torvalds authored
      Pull ARM SoC late OMAP changes from Olof Johansson:
       "This branch contains changes for OMAP that came in late during the
        release staging, close to when the merge window opened.
      
        It contains, among other things:
      
         - OMAP PM fixes and some patches for audio device integration
         - OMAP clock fixes related to common clock conversion
         - A set of patches cleaning up WFI entry and blocking.
         - A set of fixes and IP block support for PM on TI AM33xx SoCs
           (Beaglebone, etc)
         - A set of smaller fixes and cleanups around AM33xx restart and
           revision detection, as well as removal of some dead code
           (CONFIG_32K_TIMER_HZ)"
      
      * tag 'late-omap' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (34 commits)
        ARM: omap2: include linux/errno.h in hwmod_reset
        ARM: OMAP2+: fix some omap_device_build() calls that aren't compiled by default
        ARM: OMAP4: hwmod data: Enable AESS hwmod device
        ARM: OMAP4: hwmod data: Update AESS data with memory bank area
        ARM: OMAP4+: AESS: enable internal auto-gating during initial setup
        ASoC: TI AESS: add autogating-enable function, callable from architecture code
        ARM: OMAP2+: hwmod: add enable_preprogram hook
        ARM: OMAP4: clock data: Add missing clkdm association for dpll_usb
        ARM: OMAP2+: PM: Fix the dt return condition in pm_late_init()
        ARM: OMAP2: am33xx-hwmod: Fix "register offset NULL check" bug
        ARM: OMAP2+: AM33xx: hwmod: add missing HWMOD_NO_IDLEST flags
        ARM: OMAP: AM33xx hwmod: Add parent-child relationship for PWM subsystem
        ARM: OMAP: AM33xx hwmod: Corrects PWM subsystem HWMOD entries
        ARM: DTS: AM33XX: Add nodes for OCMC RAM and WKUP-M3
        ARM: OMAP2+: AM33XX: Update the hardreset API
        ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit
        ARM: OMAP2+: AM33XX: hwmod: Fixup cpgmac0 hwmod entry
        ARM: OMAP2+: AM33XX: hwmod: Update TPTC0 hwmod with the right flags
        ARM: OMAP2+: AM33XX: hwmod: Register OCMC RAM hwmod
        ARM: OMAP2+: AM33XX: CM/PRM: Use __ASSEMBLER__ macros in header files
        ...
      7307c00f
    • Linus Torvalds's avatar
      Merge tag 'late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc · f8f466c8
      Linus Torvalds authored
      Pull ARM SoC i.MX DT changes from Olof Johansson:
       "This branch contains of devicetree changes for the Freescale i.MX
        platform.
      
        The base patch of the branch changes the format of the dts files to a
        slightly different format that makes it easier to do derivative board
        definitions, but it also introduces a lot of churn in the process
        since every line of the file is touched.
      
        On top of that are a handful of the regular changes; enabling more
        boards as DT-based instead of legacy board files (mx25pdk), enabling
        another driver for devicetree and thus adding bindings (onewire), etc.
      
        I'm not happy about the churn, and will likely not take it for other
        platforms in the future."
      
      * tag 'late-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (21 commits)
        ARM: dts: add dtsi for imx6q and imx6dl
        ARM: dts: rename imx6q.dtsi to imx6qdl.dtsi
        ARM: dts: i.MX6: Add regulator delay support
        ARM: dts: Add device tree entry for onewire master on i.MX53
        ARM: i.MX53: Add clocks for i.mx53 onewire master.
        W1: Add device tree support to MXC onewire master.
        ARM: imx: enable imx6q-cpufreq support
        ARM: dts: Add apf51 basic support
        ARM i.MX6: change mxs usbphy clock usage
        ARM: dts: imx6q: Remove silicon version from SDMA firmware
        ARM i.MX53: dts: add oftree for MBa53 baseboard
        ARM i.MX53: add dts for the TQ tqma53 module
        ARM: dts: imx53: pinctrl update
        ARM i.MX51 babbage: Add keypad support
        ARM: dts: imx: Add imx51 KPP entry
        ARM: dts: imx25-karo-tx25: Put status entry in the end
        ARM: mx25pdk: Add device tree support
        ARM: dts: imx: use nodes label in board dts
        ARM: dts: add missing imx dtb targets
        ARM: boot: dts: Add an entry for imx27-pdk.dtb
        ...
      f8f466c8
    • Linus Torvalds's avatar
      Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 2af78448
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
       "Highlights:
      
         - introduction of Dove thermal sensor driver.
      
         - introduction of Kirkwood thermal sensor driver.
      
         - introduction of intel_powerclamp thermal cooling device driver.
      
         - add interrupt and DT support for rcar thermal driver.
      
         - add thermal emulation support which allows platform thermal driver
           to do software/hardware emulation for thermal issues."
      
      * 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (36 commits)
        thermal: rcar: remove __devinitconst
        thermal: return an error on failure to register thermal class
        Thermal: rename thermal governor Kconfig option to avoid generic naming
        thermal: exynos: Use the new thermal trend type for quick cooling action.
        Thermal: exynos: Add support for temperature falling interrupt.
        Thermal: Dove: Add Themal sensor support for Dove.
        thermal: Add support for the thermal sensor on Kirkwood SoCs
        thermal: rcar: add Device Tree support
        thermal: rcar: remove machine_power_off() from rcar_thermal_notify()
        thermal: rcar: add interrupt support
        thermal: rcar: add read/write functions for common/priv data
        thermal: rcar: multi channel support
        thermal: rcar: use mutex lock instead of spin lock
        thermal: rcar: enable CPCTL to use hardware TSC deciding
        thermal: rcar: use parenthesis on macro
        Thermal: fix a build warning when CONFIG_THERMAL_EMULATION cleared
        Thermal: fix a wrong comment
        thermal: sysfs: Add a new sysfs node emul_temp for thermal emulation
        PM: intel_powerclamp: off by one in start_power_clamp()
        thermal: exynos: Miscellaneous fixes to support falling threshold interrupt
        ...
      2af78448
    • Linus Torvalds's avatar
      Merge tag 'tag-for-linus-3.9' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf · 5e04f4b4
      Linus Torvalds authored
      Pull dma-buf framework updates from Sumit Semwal:
       "Refcounting implemented for vmap in core dma-buf"
      
      * tag 'tag-for-linus-3.9' of git://git.linaro.org/people/sumitsemwal/linux-dma-buf:
        CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap
        dma-buf: implement vmap refcounting in the interface logic
      5e04f4b4
    • Linus Torvalds's avatar
      Merge branch 'for-3.9' of git://linux-nfs.org/~bfields/linux · b6669737
      Linus Torvalds authored
      Pull nfsd changes from J Bruce Fields:
       "Miscellaneous bugfixes, plus:
      
         - An overhaul of the DRC cache by Jeff Layton.  The main effect is
           just to make it larger.  This decreases the chances of intermittent
           errors especially in the UDP case.  But we'll need to watch for any
           reports of performance regressions.
      
         - Containerized nfsd: with some limitations, we now support
           per-container nfs-service, thanks to extensive work from Stanislav
           Kinsbursky over the last year."
      
      Some notes about conflicts, since there were *two* non-data semantic
      conflicts here:
      
       - idr_remove_all() had been added by a memory leak fix, but has since
         become deprecated since idr_destroy() does it for us now.
      
       - xs_local_connect() had been added by this branch to make AF_LOCAL
         connections be synchronous, but in the meantime Trond had changed the
         calling convention in order to avoid a RCU dereference.
      
      There were a couple of more obvious actual source-level conflicts due to
      the hlist traversal changes and one just due to code changes next to
      each other, but those were trivial.
      
      * 'for-3.9' of git://linux-nfs.org/~bfields/linux: (49 commits)
        SUNRPC: make AF_LOCAL connect synchronous
        nfsd: fix compiler warning about ambiguous types in nfsd_cache_csum
        svcrpc: fix rpc server shutdown races
        svcrpc: make svc_age_temp_xprts enqueue under sv_lock
        lockd: nlmclnt_reclaim(): avoid stack overflow
        nfsd: enable NFSv4 state in containers
        nfsd: disable usermode helper client tracker in container
        nfsd: use proper net while reading "exports" file
        nfsd: containerize NFSd filesystem
        nfsd: fix comments on nfsd_cache_lookup
        SUNRPC: move cache_detail->cache_request callback call to cache_read()
        SUNRPC: remove "cache_request" argument in sunrpc_cache_pipe_upcall() function
        SUNRPC: rework cache upcall logic
        SUNRPC: introduce cache_detail->cache_request callback
        NFS: simplify and clean cache library
        NFS: use SUNRPC cache creation and destruction helper for DNS cache
        nfsd4: free_stid can be static
        nfsd: keep a checksum of the first 256 bytes of request
        sunrpc: trim off trailing checksum before returning decrypted or integrity authenticated buffer
        sunrpc: fix comment in struct xdr_buf definition
        ...
      b6669737
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 1cf0209c
      Linus Torvalds authored
      Pull Ceph updates from Sage Weil:
       "A few groups of patches here.  Alex has been hard at work improving
        the RBD code, layout groundwork for understanding the new formats and
        doing layering.  Most of the infrastructure is now in place for the
        final bits that will come with the next window.
      
        There are a few changes to the data layout.  Jim Schutt's patch fixes
        some non-ideal CRUSH behavior, and a set of patches from me updates
        the client to speak a newer version of the protocol and implement an
        improved hashing strategy across storage nodes (when the server side
        supports it too).
      
        A pair of patches from Sam Lang fix the atomicity of open+create
        operations.  Several patches from Yan, Zheng fix various mds/client
        issues that turned up during multi-mds torture tests.
      
        A final set of patches expose file layouts via virtual xattrs, and
        allow the policies to be set on directories via xattrs as well
        (avoiding the awkward ioctl interface and providing a consistent
        interface for both kernel mount and ceph-fuse users)."
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client: (143 commits)
        libceph: add support for HASHPSPOOL pool flag
        libceph: update osd request/reply encoding
        libceph: calculate placement based on the internal data types
        ceph: update support for PGID64, PGPOOL3, OSDENC protocol features
        ceph: update "ceph_features.h"
        libceph: decode into cpu-native ceph_pg type
        libceph: rename ceph_pg -> ceph_pg_v1
        rbd: pass length, not op for osd completions
        rbd: move rbd_osd_trivial_callback()
        libceph: use a do..while loop in con_work()
        libceph: use a flag to indicate a fault has occurred
        libceph: separate non-locked fault handling
        libceph: encapsulate connection backoff
        libceph: eliminate sparse warnings
        ceph: eliminate sparse warnings in fs code
        rbd: eliminate sparse warnings
        libceph: define connection flag helpers
        rbd: normalize dout() calls
        rbd: barriers are hard
        rbd: ignore zero-length requests
        ...
      1cf0209c
  3. 28 Feb, 2013 5 commits
    • Linus Torvalds's avatar
      Merge tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux · de1a2262
      Linus Torvalds authored
      Pull writeback fixes from Wu Fengguang:
       "Two writeback fixes
      
         - fix negative (setpoint - dirty) in 32bit archs
      
         - use down_read_trylock() in writeback_inodes_sb(_nr)_if_idle()"
      
      * tag 'writeback-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/wfg/linux:
        Negative (setpoint-dirty) in bdi_position_ratio()
        vfs: re-implement writeback_inodes_sb(_nr)_if_idle() and rename them
      de1a2262
    • Linus Torvalds's avatar
      Merge branch 'for-3.9/drivers' of git://git.kernel.dk/linux-block · f042fea0
      Linus Torvalds authored
      Pull block driver bits from Jens Axboe:
       "After the block IO core bits are in, please grab the driver updates
        from below as well.  It contains:
      
         - Fix ancient regression in dac960.  Nobody must be using that
           anymore...
      
         - Some good fixes from Guo Ghao for loop, fixing both potential
           oopses and deadlocks.
      
         - Improve mtip32xx for NUMA systems, by being a bit more clever in
           distributing work.
      
         - Add IBM RamSan 70/80 driver.  A second round of fixes for that is
           pending, that will come in through for-linus during the 3.9 cycle
           as per usual.
      
         - A few xen-blk{back,front} fixes from Konrad and Roger.
      
         - Other minor fixes and improvements."
      
      * 'for-3.9/drivers' of git://git.kernel.dk/linux-block:
        loopdev: ignore negative offset when calculate loop device size
        loopdev: remove an user triggerable oops
        loopdev: move common code into loop_figure_size()
        loopdev: update block device size in loop_set_status()
        loopdev: fix a deadlock
        xen-blkback: use balloon pages for persistent grants
        xen-blkfront: drop the use of llist_for_each_entry_safe
        xen/blkback: Don't trust the handle from the frontend.
        xen-blkback: do not leak mode property
        block: IBM RamSan 70/80 driver fixes
        rsxx: add slab.h include to dma.c
        drivers/block/mtip32xx: add missing GENERIC_HARDIRQS dependency
        block: remove new __devinit/exit annotations on ramsam driver
        block: IBM RamSan 70/80 device driver
        drivers/block/mtip32xx/mtip32xx.c:1726:5: sparse: symbol 'mtip_send_trim' was not declared. Should it be static?
        drivers/block/mtip32xx/mtip32xx.c:4029:1: sparse: symbol 'mtip_workq_sdbf0' was not declared. Should it be static?
        dac960: return success instead of -ENOTTY
        mtip32xx: add trim support
        mtip32xx: Add workqueue and NUMA support
        block: delete super ancient PC-XT driver for 1980's hardware
      f042fea0
    • Linus Torvalds's avatar
      Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block · ee89f812
      Linus Torvalds authored
      Pull block IO core bits from Jens Axboe:
       "Below are the core block IO bits for 3.9.  It was delayed a few days
        since my workstation kept crashing every 2-8h after pulling it into
        current -git, but turns out it is a bug in the new pstate code (divide
        by zero, will report separately).  In any case, it contains:
      
         - The big cfq/blkcg update from Tejun and and Vivek.
      
         - Additional block and writeback tracepoints from Tejun.
      
         - Improvement of the should sort (based on queues) logic in the plug
           flushing.
      
         - _io() variants of the wait_for_completion() interface, using
           io_schedule() instead of schedule() to contribute to io wait
           properly.
      
         - Various little fixes.
      
        You'll get two trivial merge conflicts, which should be easy enough to
        fix up"
      
      Fix up the trivial conflicts due to hlist traversal cleanups (commit
      b67bfe0d: "hlist: drop the node parameter from iterators").
      
      * 'for-3.9/core' of git://git.kernel.dk/linux-block: (39 commits)
        block: remove redundant check to bd_openers()
        block: use i_size_write() in bd_set_size()
        cfq: fix lock imbalance with failed allocations
        drivers/block/swim3.c: fix null pointer dereference
        block: don't select PERCPU_RWSEM
        block: account iowait time when waiting for completion of IO request
        sched: add wait_for_completion_io[_timeout]
        writeback: add more tracepoints
        block: add block_{touch|dirty}_buffer tracepoint
        buffer: make touch_buffer() an exported function
        block: add @req to bio_{front|back}_merge tracepoints
        block: add missing block_bio_complete() tracepoint
        block: Remove should_sort judgement when flush blk_plug
        block,elevator: use new hashtable implementation
        cfq-iosched: add hierarchical cfq_group statistics
        cfq-iosched: collect stats from dead cfqgs
        cfq-iosched: separate out cfqg_stats_reset() from cfq_pd_reset_stats()
        blkcg: make blkcg_print_blkgs() grab q locks instead of blkcg lock
        block: RCU free request_queue
        blkcg: implement blkg_[rw]stat_recursive_sum() and blkg_[rw]stat_merge()
        ...
      ee89f812
    • Linus Torvalds's avatar
      Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 21f3b24d
      Linus Torvalds authored
      Pull first round of SCSI updates from James Bottomley:
       "The patch set is mostly driver updates (bnx2fc, ipr, lpfc, qla4) and a
        few bug fixes"
      
      Pull delayed because google hates James, and sneakily considers his pull
      requests spam. Why, google, why?
      
      * tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (60 commits)
        [SCSI] aacraid: 1024 max outstanding command support for Series 7 and above
        [SCSI] bnx2fc: adjust duplicate test
        [SCSI] qla4xxx: Update driver version to 5.03.00-k4
        [SCSI] qla4xxx: Fix return code for qla4xxx_session_get_param.
        [SCSI] qla4xxx: wait for boot target login response during probe.
        [SCSI] qla4xxx: Added support for force firmware dump
        [SCSI] qla4xxx: Re-register IRQ handler while retrying initialize of adapter
        [SCSI] qla4xxx: Throttle active IOCBs to firmware limits
        [SCSI] qla4xxx: Remove unnecessary code from qla4xxx_init_local_data
        [SCSI] qla4xxx: Quiesce driver activities while loopback
        [SCSI] qla4xxx: Rename MBOX_ASTS_IDC_NOTIFY to MBOX_ASTS_IDC_REQUEST_NOTIFICATION
        [SCSI] qla4xxx: Add spurious interrupt messages under debug level 2
        [SCSI] cxgb4i: Remove the scsi host device when removing device
        [SCSI] bfa: fix strncpy() limiter in bfad_start_ops()
        [SCSI] qla4xxx: Update driver version to 5.03.00-k3
        [SCSI] qla4xxx: Correct the validation to check in get_sys_info mailbox
        [SCSI] qla4xxx: Pass correct function param to qla4_8xxx_rd_direct
        [SCSI] lpfc 8.3.37: Update lpfc version for 8.3.37 driver release
        [SCSI] lpfc 8.3.37: Fixed infinite loop in lpfc_sli4_fcf_rr_next_index_get.
        [SCSI] lpfc 8.3.37: Fixed crash due to SLI Port invalid resource count
        ...
      21f3b24d
    • Florian Fainelli's avatar
      arm: mvebu: enable the SD card slot on Armada 370 Reference Design board · 56499120
      Florian Fainelli authored
      The Armada 370 Reference Design board has one SD card slot, directly
      connected to the SDIO IP of the SoC, so we enable this IP. there are no
      GPIOs for card-detect and write-protect so we do not specify any.
      Signed-off-by: default avatarFlorian Fainelli <florian@openwrt.org>
      Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
      56499120