1. 17 Oct, 2013 12 commits
  2. 16 Oct, 2013 2 commits
    • Linus Torvalds's avatar
      Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux · 34ec4de4
      Linus Torvalds authored
      Pull device tree fixes and reverts from Grant Likely:
       "One bug fix and three reverts.  The reverts back out the slightly
        controversial feeding the entire device tree into the random pool and
        the reserved-memory binding which isn't fully baked yet.  Expect the
        reserved-memory patches at least to resurface for v3.13.
      
        The bug fixes removes a scary but harmless warning on SPARC that was
        introduced in the v3.12 merge window.  v3.13 will contain a proper fix
        that makes the new code work on SPARC.
      
        On the plus side, the diffstat looks *awesome*.  I love removing lines
        of code"
      
      * tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux:
        Revert "drivers: of: add initialization code for dma reserved memory"
        Revert "ARM: init: add support for reserved memory defined by device tree"
        Revert "of: Feed entire flattened device tree into the random pool"
        of: fix unnecessary warning on missing /cpus node
      34ec4de4
    • Linus Torvalds's avatar
      Merge branch 'fixes-for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · ba0a062e
      Linus Torvalds authored
      Pull DMA-mapping fix from Marek Szyprowski:
       "A bugfix for the IOMMU-based implementation of dma-mapping subsystem
        for ARM architecture"
      
      * 'fixes-for-v3.12' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
        ARM: dma-mapping: Always pass proper prot flags to iommu_map()
      ba0a062e
  3. 15 Oct, 2013 7 commits
  4. 14 Oct, 2013 7 commits
    • Roland Dreier's avatar
      Merge branch 'misc' into for-next · 59b5b28d
      Roland Dreier authored
      59b5b28d
    • Joe Perches's avatar
      IB: Remove unnecessary semicolons · 2b50176d
      Joe Perches authored
      These aren't necessary after switch blocks.
      Signed-off-by: default avatarJoe Perches <joe@perches.com>
      Signed-off-by: default avatarRoland Dreier <roland@purestorage.com>
      2b50176d
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · d6099aeb
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "Some more ARM fixes, nothing particularly major here.  The biggest
        change is to fix the SMP_ON_UP code so that it works with TI's Aegis
        cores"
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm:
        ARM: 7851/1: check for number of arguments in syscall_get/set_arguments()
        ARM: 7846/1: Update SMP_ON_UP code to detect A9MPCore with 1 CPU devices
        ARM: 7845/1: sharpsl_param.c: fix invalid memory access for pxa devices
        ARM: 7843/1: drop asm/types.h from generic-y
        ARM: 7842/1: MCPM: don't explode if invoked without being initialized first
      d6099aeb
    • Linus Torvalds's avatar
      Merge branch 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux · 4b60667a
      Linus Torvalds authored
      Pull SLAB fix from Pekka Enberg:
       "A regression fix for overly eager slab cache name checks"
      
      * 'slab/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/penberg/linux:
        slab_common: Do not check for duplicate slab names
      4b60667a
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 35f9162d
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
       "These fix two recent bugs in ACPIPHP (ACPI-based PCI hotplug) and
        update a bunch of web links and e-mail addresses in MAINTAINERS, docs
        and Kconfig that either are stale or will expire soon.
      
        Specifics:
      
         - The WARN_ON() in acpiphp_enumerate_slots() triggers as a false
           positive in some cases, so drop it.
      
         - Add a missing pci_dev_put() to an error code path in
           acpiphp_enumerate_slots().
      
         - Replace my old e-mail address that's going to expire with a new
           one.
      
         - Update ACPI web links and git tree information in MAINTAINERS.
      
         - Update links to the Linux-ACPI project's page in MAINTAINERS.
      
         - Update some stale links and e-mail addresses under Documentation
           and in the ACPI Kconfig file"
      
      * tag 'pm+acpi-3.12-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / hotplug / PCI: Drop WARN_ON() from acpiphp_enumerate_slots()
        ACPI / hotplug / PCI: Fix error code path in acpiphp_enumerate_slots()
        ACPI / PM / Documentation: Replace outdated project links and addresses
        MAINTAINERS / ACPI: Update links to the Linux-ACPI project web page
        MAINTAINERS / ACPI: Update links and git tree information
        MAINTAINERS / Documentation: Update Rafael's e-mail address
      35f9162d
    • Grant Likely's avatar
      Revert "of: Feed entire flattened device tree into the random pool" · b920ecc8
      Grant Likely authored
      This reverts commit 109b6236.
      
      Tim Bird expressed concern that this will have a bad effect on boot
      time, and while simple tests have shown it to be okay with simple tree,
      a device tree blob can potentially be quite large and
      add_device_randomness() is not a fast function. Rather than do this for
      all platforms unconditionally, I'm reverting this patch and would like
      to see it revisited. Instead of feeding the entire tree into the random
      pool, it would probably be appropriate to hash the tree and feed the
      hash result into the pool. There really isn't a lot of randomness in a
      device tree anyway. In the majority of cases only a handful of
      properties are going to be different between machines with the same
      baseboard.
      Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
      b920ecc8
    • Grant Likely's avatar
      of: fix unnecessary warning on missing /cpus node · 444c91e5
      Grant Likely authored
      Not all DT platforms have all the cpus collected under a /cpus node.
      That just happens to be a details of FDT, ePAPR and PowerPC platforms.
      Sparc does something different, but unfortunately the current code
      complains with a warning if /cpus isn't there. This became a problem
      with commit f86e4718, "driver/core cpu: initialize of_node in cpu's
      device structure", which caused the function to get called for all
      architectures.
      
      This commit is a temporary fix to fail silently if the cpus node isn't
      present. A proper fix will come later to allow arch code to provide a
      custom mechanism for decoding the CPU hwid if the 'reg' property isn't
      appropriate.
      Signed-off-by: default avatarGrant Likely <grant.likely@linaro.org>
      Cc: David Miller <davem@davemloft.net>
      Cc: Sudeep KarkadaNagesha <Sudeep.KarkadaNagesha@arm.com>
      Cc: Rob Herring <rob.herring@calxeda.com>
      444c91e5
  5. 13 Oct, 2013 12 commits