This project is mirrored from Pull mirroring updated .
  1. 01 Nov, 2013 10 commits
  2. 27 Oct, 2013 8 commits
    • Linus Torvalds's avatar
      Linux 3.12-rc7 · 959f5854
      Linus Torvalds authored
    • Linus Torvalds's avatar
      Merge branch 'parisc-3.12' of git:// · a2ff8206
      Linus Torvalds authored
      Pull parisc fix from Helge Deller:
       "This is a 2-line patch to save the CPU register which holds our task
        thread info pointer before calling a firmware function and then to
        restore it again afterwards.
        This is necessary because on some 64bit machines the high-order 32bits
        are being clobbered by the firmware call, and thus we failed to bring
        up secondary CPUs (and instead crashed the kernel) in some situations
        eg if we had more than 4GB RAM.  This patch fixes a bug which has been
        since ever in the parisc linux kernel and which prevented some people
        to use a 64bit kernel"
      * 'parisc-3.12' of git://
        parisc: Do not crash 64bit SMP kernels on machines with >= 4GB RAM
    • Linus Torvalds's avatar
      Merge branch 'timers-urgent-for-linus' of git:// · aff22d3f
      Linus Torvalds authored
      Pull timer fix from Ingo Molnar:
       "This tree contains a clockevents regression fix for certain ARM
      * 'timers-urgent-for-linus' of git://
        clockevents: Sanitize ticks to nsec conversion
    • Linus Torvalds's avatar
      Merge branch 'perf-urgent-for-linus' of git:// · e2756f5e
      Linus Torvalds authored
      Pull perf fixes from Ingo Molnar:
       "The tree contains three fixes:
         - Two tooling fixes
         - Reversal of the new 'MMAP2' extended mmap record ABI, introduced in
           this merge window.  (Patches were proposed to fix it but it was all
           a bit late and we felt it's safer to just delay the ABI one more
           kernel release and do it right)"
      * 'perf-urgent-for-linus' of git://
        perf: Disable PERF_RECORD_MMAP2 support
        perf scripting perl: Fix build error on Fedora 12
        perf probe: Fix to initialize fname always before use it
    • Linus Torvalds's avatar
      Merge branch 'core-urgent-for-linus' of git:// · 1c99ca43
      Linus Torvalds authored
      Pull locking fix from Ingo Molnar:
       "This tree fixes a boot crash in CONFIG_DEBUG_MUTEXES=y kernels, on
        kernels built with GCC 3.x (there are still such distros)"
      Side note: it's not just a fix for old gcc versions, it's also removing
      an incredibly broken/subtle check that LLVM had issues with, and that
      made no sense.
      * 'core-urgent-for-linus' of git://
        mutex: Avoid gcc version dependent __builtin_constant_p() usage
    • Linus Torvalds's avatar
      Merge git:// · acda24c4
      Linus Torvalds authored
      Pull SCSI target fixes from Nicholas Bellinger:
       "Here are the outstanding target pending fixes for v3.12-rc7.
        This includes a number of EXTENDED_COPY related fixes as a result of
        Thomas and Doug's continuing testing and feedback.
        Also included is an important vhost/scsi fix that addresses a long
        standing issue where the 'write' parameter for get_user_pages_fast()
        was incorrectly set for virtio-scsi WRITEs -> DMA_TO_DEVICE, and not
        for virtio-scsi READs -> DMA_FROM_DEVICE.
        This resulted in random userspace segfaults and other unpleasantness
        on KVM host, and unfortunately has been an issue since the initial
        merge of vhost/scsi in v3.6.  This patch is CC'ed to stable, along
        with two other less critical items"
      * git://
        vhost/scsi: Fix incorrect usage of get_user_pages_fast write parameter
        target/pscsi: fix return value check
        target: Fail XCOPY for non matching source + destination block_size
        target: Generate failure for XCOPY I/O with non-zero scsi_status
        target: Add missing XCOPY I/O operation sense_buffer
        iser-target: check device before dereferencing its variable
        target: Return an error for WRITE SAME with ANCHOR==1
        target: Fix assignment of LUN in tracepoints
        target: Reject EXTENDED_COPY when emulate_3pc is disabled
        target: Allow non zero ListID in EXTENDED_COPY parameter list
        target: Make target_do_xcopy failures return INVALID_PARAMETER_LIST
    • Linus Torvalds's avatar
      Merge branch 'fixes' of git:// · 63e65608
      Linus Torvalds authored
      Pull slave-dmaengine fixes from Vinod Koul:
       "Here is the late fixes pull request for dmaengine while you fly back
        from KS.
        We have a new dmaengine ML hosted by vger so a patch for that along
        with addition of Dave as driver mainatainer for ioat.  Other fixes are
        memeory leak fixes on edma driver, small fixes on rcar-hpbdma driver
        by Sergei"
      * 'fixes' of git://
        dmaengine: edma: fix another memory leak
        dma: edma: Fix memory leak
        MAINTAINERS: add to ioatdma maintainer list
        MAINTAINERS: add the new dmaengine mailing list
    • Helge Deller's avatar
      parisc: Do not crash 64bit SMP kernels on machines with >= 4GB RAM · 54e181e0
      Helge Deller authored
      Since the beginning of the parisc-linux port, sometimes 64bit SMP kernels were
      not able to bring up other CPUs than the monarch CPU and instead crashed the
      kernel.  The reason was unclear, esp. since it involved various machines (e.g.
      J5600, J6750 and SuperDome). Testing showed, that those crashes didn't happened
      when less than 4GB were installed, or if a 32bit Linux kernel was booted.
      In the end, the fix for those SMP problems is trivial:
      During the early phase of the initialization of the CPUs, including the monarch
      CPU, the PDC_PSW firmware function to enable WIDE (=64bit) mode is called.
      It's documented that this firmware function may clobber various registers, and
      one one of those possibly clobbered registers is %cr30 which holds the task
      thread info pointer.
      Now, if %cr30 would always have been clobbered, then this bug would have been
      detected much earlier. But lots of testing finally showed, that - at least for
      %cr30 - on some machines only the upper 32bits of the 64bit register suddenly
      turned zero after the firmware call.
      So, after finding the root cause, the explanation for the various crashes
      became clear:
      - On 32bit SMP Linux kernels all upper 32bit were zero, so we didn't faced this
      - Monarch CPUs in 64bit mode always booted sucessfully, because the inital task
        thread info pointer was below 4GB.
      - Secondary CPUs booted sucessfully on machines with less than 4GB RAM because
        the upper 32bit were zero anyay.
      - Secondary CPus failed to boot if we had more than 4GB RAM and the task thread
        info pointer was located above the 4GB boundary.
      Finally, the patch to fix this problem is trivial by saving the %cr30 register
      before the firmware call and restoring it afterwards.
      Signed-off-by: default avatarHelge Deller <>
      Signed-off-by: default avatarJohn David Anglin <>
      Cc: <> # 2.6.12+
      Signed-off-by: default avatarHelge Deller <>
  3. 26 Oct, 2013 1 commit
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.12-rc7' of git:// · 20582e34
      Linus Torvalds authored
      Pull ACPI and power management fixes from
       "These fix two bugs in the intel_pstate driver, a hibernate bug leading
        to nasty resume failures sometimes and acpi-cpufreq initialization bug
        that causes problems to happen during module unload when intel_pstate
        is in use.
         - Fix for rounding errors in intel_pstate causing CPU utilization to
           be underestimated from Brennan Shacklett.
         - intel_pstate fix to always use the correct max pstate value when
           computing the min pstate from Dirk Brandewie.
         - Hibernation fix for deadlocking resume in cases when the probing of
           the device containing the image is deferred from Russ Dill.
         - acpi-cpufreq fix to prevent the module from staying in memory when
           the driver cannot be registered and then attempting to unregister
           things that have never been registered on exit"
      * tag 'pm+acpi-3.12-rc7' of git://
        acpi-cpufreq: Fail initialization if driver cannot be registered
        PM / hibernate: Move software_resume to late_initcall_sync
        intel_pstate: Correct calculation of min pstate value
        intel_pstate: Improve accuracy by not truncating until final result
  4. 25 Oct, 2013 9 commits
    • Linus Torvalds's avatar
      Merge tag 'for-linus-20131025' of git:// · d255c59a
      Linus Torvalds authored
      Pull final mtd fixes from Brian Norris:
       "A few more last-minute regression fixes, prepared jointly by me and
        David Woodhouse:
         - Revert pxa3xx to its old name to avoid breaking existing
           'mtdparts=' boot strings.
         - Return GPMI NAND to its legacy ECC layout for backwards
           compatibility.  We will revisit this in 3.13.
        A note from David on the latter fix: 'This leaves a harmless cosmetic
        warning about an unused function.  At this point in the cycle I really
        don't care.'"
      * tag 'for-linus-20131025' of git://
        mtd: gpmi: fix ECC regression
        mtd: nand: pxa3xx: Fix registered MTD name
    • Nicholas Bellinger's avatar
      vhost/scsi: Fix incorrect usage of get_user_pages_fast write parameter · 60a01f55
      Nicholas Bellinger authored
      This patch addresses a long-standing bug where the get_user_pages_fast()
      write parameter used for setting the underlying page table entry permission
      bits was incorrectly set to write=1 for data_direction=DMA_TO_DEVICE, and
      passed into get_user_pages_fast() via vhost_scsi_map_iov_to_sgl().
      However, this parameter is intended to signal WRITEs to pinned userspace
      PTEs for the virtio-scsi DMA_FROM_DEVICE -> READ payload case, and *not*
      for the virtio-scsi DMA_TO_DEVICE -> WRITE payload case.
      This bug would manifest itself as random process segmentation faults on
      KVM host after repeated vhost starts + stops and/or with lots of vhost
      endpoints + LUNs.
      Cc: Stefan Hajnoczi <>
      Cc: Michael S. Tsirkin <>
      Cc: Asias He <>
      Cc: <> # 3.6+
      Signed-off-by: default avatarNicholas Bellinger <>
    • Wei Yongjun's avatar
      target/pscsi: fix return value check · 58932e96
      Wei Yongjun authored
      In case of error, the function scsi_host_lookup() returns NULL
      pointer not ERR_PTR(). The IS_ERR() test in the return value check
      should be replaced with NULL test.
      Signed-off-by: default avatarWei Yongjun <>
      Cc: <>
      Signed-off-by: default avatarNicholas Bellinger <>
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git:// · f55ac56d
      Linus Torvalds authored
      Pull vfs fixes (try two) from Al Viro:
       "nfsd performance regression fix + seq_file lseek(2) fix"
      * 'for-linus' of git://
        seq_file: always update file->f_pos in seq_lseek()
        nfsd regression since delayed fput()
    • David Woodhouse's avatar
      mtd: gpmi: fix ECC regression · 031e2777
      David Woodhouse authored
      The "legacy" ECC layout used until 3.12-rc1 uses all the OOB area by
      computing the ECC strength and ECC step size ourselves.
      Commit 2febcdf8
       ("mtd: gpmi: set the BCHs geometry with the ecc info")
      makes the driver use the ECC info (ECC strength and ECC step size)
      provided by the MTD code, and creates a different NAND ECC layout
      for the BCH, and use the new ECC layout. This causes a regression:
         We can not mount the ubifs which was created by the old NAND ECC layout.
      This patch fixes this issue by reverting to the legacy ECC layout.
      We will probably introduce a new device-tree property to indicate that
      the new ECC layout can be used. For now though, for the imminent 3.12
      release, we just unconditionally revert to the 3.11 behaviour.
      This leaves a harmless cosmetic warning about an unused function. At
      this point in the cycle I really don't care.
      Signed-off-by: default avatarDavid Woodhouse <>
      Signed-off-by: default avatarBrian Norris <>
      Acked-by: default avatarHuang Shijie <>
      Acked-by: default avatarMarek Vasut <>
      Tested-by: default avatarMarek Vasut <>
    • Gu Zheng's avatar
      seq_file: always update file->f_pos in seq_lseek() · 05e16745
      Gu Zheng authored
      This issue was first pointed out by Jiaxing Wang several months ago, but no
      further comments:
      As we know pread() does not change f_pos, so after pread(), file->f_pos
      and m->read_pos become different. And seq_lseek() does not update file->f_pos
      if offset equals to m->read_pos, so after pread() and seq_lseek()(lseek to
      m->read_pos), then a subsequent read may read from a wrong position, the
      following program produces the problem:
          char str1[32] = { 0 };
          char str2[32] = { 0 };
          int poffset = 10;
          int count = 20;
          /*open any seq file*/
          int fd = open("/proc/modules", O_RDONLY);
          pread(fd, str1, count, poffset);
          printf("pread:%s\n", str1);
          /*seek to where m->read_pos is*/
          lseek(fd, poffset+count, SEEK_SET);
          /*supposed to read from poffset+count, but this read from position 0*/
          read(fd, str2, count);
          printf("read:%s\n", str2);
      out put:
       ck_netbios_ns 12665
      nf_conntrack_netbios_ns 12665 0 - Live 0xffffffffa038b000
      nf_conntrack_broadcast 12589 1 nf_conntrack_netbios_ns, Live 0xffffffffa0386000
      So we always update file->f_pos to offset in seq_lseek() to fix this issue.
      Signed-off-by: default avatarJiaxing Wang <>
      Signed-off-by: default avatarGu Zheng <>
      Signed-off-by: default avatarAl Viro <>
    • Rafael J. Wysocki's avatar
      acpi-cpufreq: Fail initialization if driver cannot be registered · 75c07581
      Rafael J. Wysocki authored
      Make acpi_cpufreq_init() return error codes when the driver cannot be
      registered so that the module doesn't stay useless in memory and so
      that acpi_cpufreq_exit() doesn't attempt to unregister things that
      have never been registered when the module is unloaded.
      Signed-off-by: default avatarRafael J. Wysocki <>
      Acked-by: default avatarViresh Kumar <>
    • Linus Torvalds's avatar
      Merge tag 'fixes-for-linus' of git:// · 4208c471
      Linus Torvalds authored
      Pull ARM SoC fixes from Olof Johansson:
       "There's really only one bugfix in this branch, which is a fix for
        timers on the integrator platform.  Since Linus Walleij is
        resurrecting support for the platform it seems valuable to get the fix
        into 3.12 even though the regression has been around a while.
        The rest are a handful of maintainers updates.  If you prefer to hold
        those until 3.13 then just merge the first patch on the branch which
        is the fix"
      * tag 'fixes-for-linus' of git://
        MAINTAINERS: Add maintainers entry for Rockchip SoCs
        MAINTAINERS: Tegra updates, and driver ownership
        MAINTAINERS: ARM: mvebu: add Sebastian Hesselbarth
        ARM: integrator: deactivate timer0 on the Integrator/CP
    • Linus Torvalds's avatar
      Merge tag 'ecryptfs-3.12-rc7-fixes' of... · 88829dfe
      Linus Torvalds authored
      Merge tag 'ecryptfs-3.12-rc7-fixes' of git://
      Pull ecryptfs fixes from Tyler Hicks:
       "Two important fixes
         - Fix long standing memory leak in the (rarely used) public key
         - Fix large file corruption on 32 bit architectures"
      * tag 'ecryptfs-3.12-rc7-fixes' of git://
        eCryptfs: fix 32 bit corruption issue
        ecryptfs: Fix memory leakage in keystore.c
  5. 24 Oct, 2013 12 commits