1. 08 Aug, 2014 32 commits
  2. 07 Aug, 2014 8 commits
    • Linus Torvalds's avatar
      Merge tag 'microblaze-3.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze · 7f0d32e0
      Linus Torvalds authored
      Pull microblaze updates from Michal Simek:
       - add new syscall and fix comment
       - fix udelay implementation
       - fix libgcc for modules
      
      * tag 'microblaze-3.17-rc1' of git://git.monstr.eu/linux-2.6-microblaze:
        microblaze: Change libgcc-style functions from lib-y to obj-y
        microblaze: Wire-up renameat2 syscall
        microblaze: Add syscall number comment
        microblaze: delay.h fix udelay and ndelay for 8 bit args
      7f0d32e0
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 · 8b076738
      Linus Torvalds authored
      Pull avr32 fix from Hans-Christian Egtvedt.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
        avr32: fix error return code
      8b076738
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · f536b3ca
      Linus Torvalds authored
      Pull powerpc updates from Ben Herrenschmidt:
       "This is the powerpc new goodies for 3.17.  The short story:
      
        The biggest bit is Michael removing all of pre-POWER4 processor
        support from the 64-bit kernel.  POWER3 and rs64.  This gets rid of a
        ton of old cruft that has been bitrotting in a long while.  It was
        broken for quite a few versions already and nobody noticed.  Nobody
        uses those machines anymore.  While at it, he cleaned up a bunch of
        old dusty cabinets, getting rid of a skeletton or two.
      
        Then, we have some base VFIO support for KVM, which allows assigning
        of PCI devices to KVM guests, support for large 64-bit BARs on
        "powernv" platforms, support for HMI (Hardware Management Interrupts)
        on those same platforms, some sparse-vmemmap improvements (for memory
        hotplug),
      
        There is the usual batch of Freescale embedded updates (summary in the
        merge commit) and fixes here or there, I think that's it for the
        highlights"
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (102 commits)
        powerpc/eeh: Export eeh_iommu_group_to_pe()
        powerpc/eeh: Add missing #ifdef CONFIG_IOMMU_API
        powerpc: Reduce scariness of interrupt frames in stack traces
        powerpc: start loop at section start of start in vmemmap_populated()
        powerpc: implement vmemmap_free()
        powerpc: implement vmemmap_remove_mapping() for BOOK3S
        powerpc: implement vmemmap_list_free()
        powerpc: Fail remap_4k_pfn() if PFN doesn't fit inside PTE
        powerpc/book3s: Fix endianess issue for HMI handling on napping cpus.
        powerpc/book3s: handle HMIs for cpus in nap mode.
        powerpc/powernv: Invoke opal call to handle hmi.
        powerpc/book3s: Add basic infrastructure to handle HMI in Linux.
        powerpc/iommu: Fix comments with it_page_shift
        powerpc/powernv: Handle compound PE in config accessors
        powerpc/powernv: Handle compound PE for EEH
        powerpc/powernv: Handle compound PE
        powerpc/powernv: Split ioda_eeh_get_state()
        powerpc/powernv: Allow to freeze PE
        powerpc/powernv: Enable M64 aperatus for PHB3
        powerpc/eeh: Aux PE data for error log
        ...
      f536b3ca
    • Linus Torvalds's avatar
      Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus · e6698305
      Linus Torvalds authored
      Pull MIPS updates from Ralf Baechle:
       "This is the main pull request for 3.17.  It contains:
      
         - misc Cavium Octeon, BCM47xx, BCM63xx and Alchemy  updates
         - MIPS ptrace updates and cleanups
         - various fixes that will also go to -stable
         - a number of cleanups and small non-critical fixes.
         - NUMA support for the Loongson 3.
         - more support for MSA
         - support for MAAR
         - various FP enhancements and fixes"
      
      * 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (139 commits)
        MIPS: jz4740: remove unnecessary null test before debugfs_remove
        MIPS: Octeon: remove unnecessary null test before debugfs_remove_recursive
        MIPS: ZBOOT: implement stack protector in compressed boot phase
        MIPS: mipsreg: remove duplicate MIPS_CONF4_FTLBSETS_SHIFT
        MIPS: Bonito64: remove a duplicate define
        MIPS: Malta: initialise MAARs
        MIPS: Initialise MAARs
        MIPS: detect presence of MAARs
        MIPS: define MAAR register accessors & bits
        MIPS: mark MSA experimental
        MIPS: Don't build MSA support unless it can be used
        MIPS: consistently clear MSA flags when starting & copying threads
        MIPS: 16 byte align MSA vector context
        MIPS: disable preemption whilst initialising MSA
        MIPS: ensure MSA gets disabled during boot
        MIPS: fix read_msa_* & write_msa_* functions on non-MSA toolchains
        MIPS: fix MSA context for tasks which don't use FP first
        MIPS: init upper 64b of vector registers when MSA is first used
        MIPS: save/disable MSA in lose_fpu
        MIPS: preserve scalar FP CSR when switching vector context
        ...
      e6698305
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · ebb067d2
      Linus Torvalds authored
      Pull s390 updates from Martin Schwidefsky:
       "Mostly cleanups and bug-fixes, with two exceptions.
      
        The first is lazy flushing of I/O-TLBs for PCI to improve performance,
        the second is software dirty bits in the pmd for the madvise-free
        implementation"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (24 commits)
        s390/locking: Reenable optimistic spinning
        s390/mm: implement dirty bits for large segment table entries
        KVM: s390/mm: Fix page table locking vs. split pmd lock
        s390/dasd: fix camel case
        s390/3215: fix hanging console issue
        s390/irq: improve displayed interrupt order in /proc/interrupts
        s390/seccomp: fix error return for filtered system calls
        s390/pci: introduce lazy IOTLB flushing for DMA unmap
        dasd: fix error recovery for alias devices during format
        dasd: fix list_del corruption during format
        dasd: fix unresponsive device during format
        dasd: use aliases for formatted devices during format
        s390/pci: fix kmsg component
        s390/kdump: Return NOTIFY_OK for all actions other than MEM_GOING_OFFLINE
        s390/watchdog: Fix module name in Kconfig help text
        s390/dasd: replace seq_printf by seq_puts
        s390/dasd: replace pr_warning by pr_warn
        s390/dasd: Move EXPORT_SYMBOL after function/variable
        s390/dasd: remove unnecessary null test before debugfs_remove
        s390/zfcp: use qdio buffer helpers
        ...
      ebb067d2
    • Julia Lawall's avatar
      avr32: fix error return code · 686913aa
      Julia Lawall authored
      Convert a zero return value on error to a negative one, as returned
      elsewhere in the function.
      
      A simplified version of the semantic match that finds this problem is as
      follows: (http://coccinelle.lip6.fr/)
      
      // <smpl>
      @@
      identifier ret; expression e1,e2;
      @@
      (
      if (\(ret < 0\|ret != 0\))
       { ... return ret; }
      |
      ret = 0
      )
      ... when != ret = e1
          when != &ret
      *if(...)
      {
        ... when != ret = e2
            when forall
       return ret;
      }
      // </smpl>
      Signed-off-by: default avatarJulia Lawall <Julia.Lawall@lip6.fr>
      Acked-by: default avatarHans-Christian Egtvedt <egtvedt@samfundet.no>
      686913aa
    • Linus Torvalds's avatar
      Merge branch 'akpm' (patchbomb from Andrew Morton) · 33caee39
      Linus Torvalds authored
      Merge incoming from Andrew Morton:
       - Various misc things.
       - arch/sh updates.
       - Part of ocfs2.  Review is slow.
       - Slab updates.
       - Most of -mm.
       - printk updates.
       - lib/ updates.
       - checkpatch updates.
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (226 commits)
        checkpatch: update $declaration_macros, add uninitialized_var
        checkpatch: warn on missing spaces in broken up quoted
        checkpatch: fix false positives for --strict "space after cast" test
        checkpatch: fix false positive MISSING_BREAK warnings with --file
        checkpatch: add test for native c90 types in unusual order
        checkpatch: add signed generic types
        checkpatch: add short int to c variable types
        checkpatch: add for_each tests to indentation and brace tests
        checkpatch: fix brace style misuses of else and while
        checkpatch: add --fix option for a couple OPEN_BRACE misuses
        checkpatch: use the correct indentation for which()
        checkpatch: add fix_insert_line and fix_delete_line helpers
        checkpatch: add ability to insert and delete lines to patch/file
        checkpatch: add an index variable for fixed lines
        checkpatch: warn on break after goto or return with same tab indentation
        checkpatch: emit a warning on file add/move/delete
        checkpatch: add test for commit id formatting style in commit log
        checkpatch: emit fewer kmalloc_array/kcalloc conversion warnings
        checkpatch: improve "no space after cast" test
        checkpatch: allow multiple const * types
        ...
      33caee39
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net · 6456a043
      Linus Torvalds authored
      Pull networking fixes from David Miller:
       "This fixes the most immediate fallout from yesterday's networking
        merge:
      
         1) sock_tx_timestamp() must not clear the passed in tx_flags, but
            rather add to them.  Fix from Eric Dumazet.
      
         2) The hyperv driver sendbuf region increase needs to be decreased
            slightly to handle older backends.  From KY Srinivasan.
      
         3) Fix RCU lockdep splats in netlink diag after recent hashing
            changes, from Thomas Graf.
      
         4) The new IPV6_FLOWLABEL was given a socket option number that
            overlapped with an existing IP6 tables one, breaking ip6_tables.
            Fixed by Pablo Neira Ayuso"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
        netlink: hold nl_sock_hash_lock during diag dump
        tcp: md5: check md5 signature without socket lock
        net: fix USB network driver config option.
        net: reallocate new socket option number for IPV6_AUTOFLOWLABEL
        vmxnet3: fix decimal printf format specifiers prefixed with 0x
        net-timestamp: cumulative tcp timestamping fixes
        hyperv: Adjust the size of sendbuf region to support ws2008r2
        cxgb4: Fix for SR-IOV VF initialization
        net-timestamp: sock_tx_timestamp() fix
      6456a043