Skip to content
  1. Aug 03, 2013
    • Linus Torvalds's avatar
      Merge tag 'gpio-for-v3.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 1cb39a6c
      Linus Torvalds authored
      Pull GPIO fixes from Linus Walleij:
       "Yet another GPIO pull request, fixing the fix from the last one.  It
        turns out that fixing the boot path for device tree boots on OMAP
        breaks out antique systems (such as OMAP1) and we need to find a
        better way.  So we're reverting that "fix" for the moment and thinking
        about something better.
      
        Also fixing a build issue on the MSM driver"
      
      * tag 'gpio-for-v3.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio_msm: Fix build error due to missing err.h
        Revert "gpio/omap: don't create an IRQ mapping for every GPIO on DT"
        Revert "gpio/omap: auto request GPIO as input if used as IRQ via DT"
        Revert "gpio/omap: fix build error when OF_GPIO is not defined."
      1cb39a6c
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · e7e2e511
      Linus Torvalds authored
      Pull powerpc fixes from Ben Herrenschmidt:
       "Here is not quite a handful of powerpc fixes for rc3.
      
        The windfarm fix is a regression fix (though not a new one), the PMU
        interrupt rename is not a fix per-se but has been submitted a long
        time ago and I kept forgetting to put it in (it puts us back in sync
        with x86), the other perf bit is just about putting an API/ABI bit
        definition in the right place for userspace to consume, and finally,
        we have a fix for the VPHN (Virtual Partition Home Node) feature
        (notification that the hypervisor is moving nodes around) which could
        cause lockups so we may as well fix it now"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31)
        powerpc: VPHN topology change updates all siblings
        powerpc/perf: Export PERF_EVENT_CONFIG_EBB_SHIFT to userspace
        powerpc: Rename PMU interrupts from CNT to PMI
      e7e2e511
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git://git.linaro.org/people/rmk/linux-arm · 6d039f8f
      Linus Torvalds authored
      Pull ARM fixes from Russell King:
       "I've thought long and hard about what to say for this pull request,
        and I really can't work out anything sane to say to summarise much of
        these commits.  The problem is, for most of these are, yet again, lots
        of small bits scattered around the place without any real overall
        theme to them"
      
      Most notable is probably the kuser page helper improvements.
      
      * 'fixes' of git://git.linaro.org/people/rmk/linux-arm: (22 commits)
        ARM: Add .text annotations where required after __CPUINIT removal
        ARM: 7803/1: Fix deadlock scenario with smp_send_stop()
        ARM: make vectors page inaccessible from userspace
        ARM: move signal handlers into a vdso-like page
        ARM: allow kuser helpers to be removed from the vector page
        ARM: update FIQ support for relocation of vectors
        ARM: use linker magic for vectors and vector stubs
        ARM: move vector stubs
        ARM: poison memory between kuser helpers
        ARM: poison the vectors page
        ARM: 7801/1: v6: prevent gcc 4.5 from reordering extended CP15 reads above is_smp() test
        ARM: 7800/1: ARMv7-M: Fix name of NVIC handler function
        ARM: Fix sorting of machine- initializers
        ARM: 7791/1: a.out: remove partial a.out support
        ARM: 7790/1: Fix deferred mm switch on VIVT processors
        ARM: 7789/1: Do not run dummy_flush_tlb_a15_erratum() on non-Cortex-A15
        ARM: 7787/1: virt: ensure visibility of __boot_cpu_mode
        ARM: 7788/1: elf: fix lpae hwcap feature reporting in proc/cpuinfo
        ARM: 7786/1: hyp: fix macro parameterisation
        ARM: 7785/1: mm: restrict early_alloc to section-aligned memory
        ...
      6d039f8f
    • Linus Torvalds's avatar
      Merge branch 'parisc-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · efc68164
      Linus Torvalds authored
      Pull parisc updates from Helge Deller:
       "The majority of lines changed are due the addition of a defconfig for
        the C8000 machine.  Even the fix in parisc/kernel/cache.c file is
        actually ony a 10-line fix, but the change became bigger (and much
        nicer) to avoid errors of the checkpatch script.
      
        Here is the short-changelog:
      
        This round of parisc updates includes mostly fixes for the C8000
        workstation.  We have a new defconfig file for this machine, as well
        as fixes for it's serial port, the AGP driver and the cache routines
        to cope with the vmas of the FireGL card in a C8000.  The sys32.h
        header file was not used and as such it's now gone"
      
      * 'parisc-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Fix interrupt routing for C8000 serial ports
        parisc: Remove arch/parisc/kernel/sys32.h header
        parisc: add defconfig for c8000 machine
        parisc: agp/parisc-agp: allow binding of user memory to the AGP GART
        parisc: Fix cache routines to ignore vma's with an invalid pfn
      efc68164
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid · f9ed432c
      Linus Torvalds authored
      Pull HID fixes from Jiri Kosina:
       - fix hid-sony PS3 sixaxxis breakage from Benjamin Tissories
       - fix hidraw race condition from Yonghua Zheng
       - fix/bandaid for rare device enumeration problems of Logitech Unifying
         receivers from Nestor Lopez Casado
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid:
        HID: hidraw: fix improper mutex release
        HID: sony: fix HID mapping for PS3 sixaxis controller
        HID: hid-logitech-dj: querying_devices was never set
        HID: Revert "Revert "HID: Fix logitech-dj: missing Unifying device issue""
      f9ed432c
    • Linus Torvalds's avatar
      Merge tag 'please-pull-fix-mce-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras · 940e84fc
      Linus Torvalds authored
      Pull MCE fix from Tony Luck:
       "Fix a regression in mce-severity.c"
      
      * tag 'please-pull-fix-mce-regression' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
        x86/mce: Fix mce regression from recent cleanup
      940e84fc
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · aa8032b6
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
       "Yinghai fixed a couple regressions: one resource assignment problem
        introduced in v3.10 that showed up with SR-IOV on powerpc, and another
        SR-IOV hot-remove issue related to refcounting changes we merged for
        v3.11.
      
        Yinghai is still working on another SR-IOV-related fix or two, which
        will be simpler if pciehp is non-modular, so I included the Kconfig
        changes now to get them in earlier.
      
        Finally, a minor fix for the ARM Marvell EBU host bridge driver that
        was merged for v3.11
      
        Hotplug:
            PCI: pciehp: Fix null pointer deref when hot-removing SR-IOV device
            PCI: hotplug: Convert to be builtin only, not modular
            PCI: pciehp: Convert pciehp to be builtin only, not modular
      
        Resource allocation:
            PCI: Retry allocation of only the resource type that failed
      
        ARM:
            PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge"
      
      * tag 'pci-v3.11-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge
        PCI: Retry allocation of only the resource type that failed
        PCI: pciehp: Convert pciehp to be builtin only, not modular
        PCI: hotplug: Convert to be builtin only, not modular
        PCI: pciehp: Fix null pointer deref when hot-removing SR-IOV device
      aa8032b6
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 1fe0135b
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - Revert two cpuidle commits added during the 3.8 development cycle
         that turn out to have introduced a significant performance regression
         as requested by Jeremy Eder.
      
       - The recent patches that made the freezer less heavy-weight introduced
         a regression causing user-space-driven hibernation using the ioctl()
         interface to block indefinitely when the hibernate process executes
         try_to_freeze().  Fix from Colin Cross addresses this by adding a
         process flag to mark the hibernate/suspend process to inform the
         freezer that that process should be ignored.
      
       - One of the recent cpufreq reverts uncovered a problem in the core
         causing the cpufreq driver module refcount to become negative after a
         system suspend-resume cycle.  Fix from Rafael J Wysocki.
      
       - The evaluation of the ACPI battery _BIX method has never worked
         correctly, because the commit that added support for it forgot to
         take the "Revision" field in the return package into account.  As a
         result, the reading of battery info doesn't work at all on some
         systems, which is addressed by a fix from Lan Tianyu.
      
      * tag 'pm+acpi-3.11-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        freezer: set PF_SUSPEND_TASK flag on tasks that call freeze_processes
        ACPI / battery: Fix parsing _BIX return value
        cpufreq: Fix cpufreq driver module refcount balance after suspend/resume
        Revert "cpuidle: Quickly notice prediction failure for repeat mode"
        Revert "cpuidle: Quickly notice prediction failure in general case"
      1fe0135b
  2. Aug 02, 2013
    • Thomas Petazzoni's avatar
      PCI: mvebu: Disable prefetchable memory support in PCI-to-PCI bridge · 36dd1f3e
      Thomas Petazzoni authored
      
      
      The Marvell PCIe driver uses an emulated PCI-to-PCI bridge to be able
      to dynamically set up MBus address decoding windows for PCI I/O and
      memory regions depending on the PCI devices enumerated by Linux.
      
      However, this emulated PCI-to-PCI bridge logic makes the Linux PCI
      core believe that prefetchable memory regions are supported (because
      the registers are read/write), while in fact no adress decoding window
      is ever created for such regions. Since the Marvell MBus address
      decoding windows do not distinguish memory regions and prefetchable
      memory regions, this patch takes a simple approach: change the
      PCI-to-PCI bridge emulation to let the Linux PCI core know that we
      don't support prefetchable memory regions.
      
      To achieve this, we simply make the prefetchable memory base a
      read-only register that always returns 0. Reading/writing all the
      other prefetchable memory related registers has no effect.
      
      This problem was originally reported by Finn Hoffmann
      <finn@uni-bremen.de>, who couldn't get a RTL8111/8168B PCI NIC working
      on the NSA310 Kirkwood platform after updating to 3.11-rc. The problem
      was that the PCI-to-PCI bridge emulation was making the Linux PCI core
      believe that we support prefetchable memory, so the Linux PCI core was
      only filling the prefetchable memory base and limit registers, which
      does not lead to a MBus window being created. The below patch has been
      confirmed by Finn Hoffmann to fix his problem on Kirkwood, and has
      otherwise been successfully tested on the Armada XP GP platform with a
      e1000e PCIe NIC and a Marvell SATA PCIe card.
      
      Reported-by: default avatarFinn Hoffmann <finn@uni-bremen.de>
      Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
      Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
      36dd1f3e
    • Russell King's avatar
      Merge branch 'security-fixes' into fixes · 24195cad
      Russell King authored
      24195cad
  3. Aug 01, 2013