1. 29 Oct, 2013 11 commits
  2. 25 Oct, 2013 1 commit
  3. 20 Oct, 2013 3 commits
  4. 19 Oct, 2013 2 commits
  5. 18 Oct, 2013 7 commits
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · bdeeab62
      Linus Torvalds authored
      Pull btrfs fix from Chris Mason:
       "Sage hit a deadlock with ceph on btrfs, and Josef tracked it down to a
        regression in our initial rc1 pull.  When doing nocow writes we were
        sometimes starting a transaction with locks held"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: release path before starting transaction in can_nocow_extent
      bdeeab62
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 797afdf7
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
      
       - intel_pstate fix for misbehavior after system resume if sysfs
         attributes are set in a specific way before the corresponding suspend
         from Dirk Brandewie.
      
       - A recent intel_pstate fix has no effect if unsigned long is 32-bit,
         so fix it up to cover that case as well.
      
       - The s3c64xx cpufreq driver was not updated when the index field of
         struct cpufreq_frequency_table was replaced with driver_data, so
         update it now.  From Charles Keepax.
      
       - The Kconfig help text for ACPI_BUTTON still refers to
         /proc/acpi/event that has been dropped recently, so modify it to
         remove that reference.  From Krzysztof Mazur.
      
       - A Lan Tianyu's change adds a missing mutex unlock to an error code
         path in acpi_resume_power_resources().
      
       - Some code related to ACPI power resources, whose very purpose is
         questionable to put it lightly, turns out to cause problems to happen
         during testing on real systems, so remove it completely (we may
         revisit that in the future if there's a compelling enough reason).
         From Rafael J Wysocki and Aaron Lu.
      
      * tag 'pm+acpi-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / PM: Drop two functions that are not used any more
        ATA / ACPI: remove power dependent device handling
        cpufreq: s3c64xx: Rename index to driver_data
        ACPI / power: Drop automaitc resume of power resource dependent devices
        intel_pstate: Fix type mismatch warning
        cpufreq / intel_pstate: Fix max_perf_pct on resume
        ACPI: remove /proc/acpi/event from ACPI_BUTTON help
        ACPI / power: Release resource_lock after acpi_power_get_state() return error
      797afdf7
    • Linus Torvalds's avatar
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 9219cec5
      Linus Torvalds authored
      Pull x86 fixes from Ingo Molnar:
       "Two fixlets:
      
         - fix a (rare-config) build bug
         - fix a next-gen SGI/UV hw/firmware enumeration bug"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Update UV3 hub revision ID
        x86/microcode: Correct Kconfig dependencies
      9219cec5
    • Josef Bacik's avatar
      Btrfs: release path before starting transaction in can_nocow_extent · 1bda19eb
      Josef Bacik authored
      We can't be holding tree locks while we try to start a transaction, we will
      deadlock.  Thanks,
      Reported-by: default avatarSage Weil <sage@inktank.com>
      Signed-off-by: default avatarJosef Bacik <jbacik@fusionio.com>
      Signed-off-by: default avatarChris Mason <chris.mason@fusionio.com>
      1bda19eb
    • Rafael J. Wysocki's avatar
      Merge branch 'acpi-fixes' · 981984cb
      Rafael J. Wysocki authored
      * acpi-fixes:
        ACPI / PM: Drop two functions that are not used any more
        ATA / ACPI: remove power dependent device handling
        ACPI / power: Drop automaitc resume of power resource dependent devices
        ACPI: remove /proc/acpi/event from ACPI_BUTTON help
        ACPI / power: Release resource_lock after acpi_power_get_state() return error
      981984cb
    • Rafael J. Wysocki's avatar
      Merge branch 'pm-fixes' · bdbff716
      Rafael J. Wysocki authored
      * pm-fixes:
        cpufreq: s3c64xx: Rename index to driver_data
        intel_pstate: Fix type mismatch warning
        cpufreq / intel_pstate: Fix max_perf_pct on resume
      bdbff716
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6 · 04919afb
      Linus Torvalds authored
      Pull CIFS fixes from Steve French:
       "Five small cifs fixes (includes fixes for: unmount hang, 2 security
        related, symlink, large file writes)"
      
      * 'for-linus' of git://git.samba.org/sfrench/cifs-2.6:
        cifs: ntstatus_to_dos_map[] is not terminated
        cifs: Allow LANMAN auth method for servers supporting unencapsulated authentication methods
        cifs: Fix inability to write files >2GB to SMB2/3 shares
        cifs: Avoid umount hangs with smb2 when server is unresponsive
        do not treat non-symlink reparse points as valid symlinks
      04919afb
  6. 17 Oct, 2013 16 commits
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.12-rc6' of... · 83f11a9c
      Linus Torvalds authored
      Merge tag 'driver-core-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fix from Greg KH:
       "Here is one fix for the hotplug memory path that resolves a regression
        when removing memory that showed up in 3.12-rc1"
      
      * tag 'driver-core-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        driver core: Release device_hotplug_lock when store_mem_state returns EINVAL
      83f11a9c
    • Linus Torvalds's avatar
      Merge tag 'usb-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 02a3250f
      Linus Torvalds authored
      Pull USB fixes from Greg KH:
       "Here are some USB fixes and new device ids for 3.12-rc6
      
        The largest change here is a bunch of new device ids for the option
        USB serial driver for new Huawei devices.  Other than that, just some
        small bug fixes for issues that people have reported (run-time and
        build-time), nothing major"
      
      * tag 'usb-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb:
        usb: usb_phy_gen: refine conditional declaration of usb_nop_xceiv_register
        usb: misc: usb3503: Fix compile error due to incorrect regmap depedency
        usb/chipidea: fix oops on memory allocation failure
        usb-storage: add quirk for mandatory READ_CAPACITY_16
        usb: serial: option: blacklist Olivetti Olicard200
        USB: quirks: add touchscreen that is dazzeled by remote wakeup
        Revert "usb: musb: gadget: fix otg active status flag"
        USB: quirks.c: add one device that cannot deal with suspension
        USB: serial: option: add support for Inovia SEW858 device
        USB: serial: ti_usb_3410_5052: add Abbott strip port ID to combined table as well.
        USB: support new huawei devices in option.c
        usb: musb: start musb on the udc side, too
        xhci: Fix spurious wakeups after S5 on Haswell
        xhci: fix write to USB3_PSSEN and XUSB2PRM pci config registers
        xhci: quirk for extra long delay for S4
        xhci: Don't enable/disable RWE on bus suspend/resume.
      02a3250f
    • Linus Torvalds's avatar
      Merge tag 'tty-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · 7b4a5155
      Linus Torvalds authored
      Pull serial driver fixes from Greg KH:
       "Here are two serial driver fixes for your tree.  One is a revert of a
        patch that causes a build error, the other is a fix to provide the
        correct brace placement which resolves a bug where the driver was not
        working properly"
      
      * tag 'tty-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        serial: vt8500: add missing braces
        Revert "serial: i.MX: evaluate linux,stdout-path property"
      7b4a5155
    • Linus Torvalds's avatar
      Merge tag 'char-misc-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 66eb411e
      Linus Torvalds authored
      Pull char/misc driver fixes from Greg KH:
       "Here are some small iio and w1 driver fixes for 3.12-rc6.
      
        There is also a hyper-v fix in here, which turned out to be incorrect,
        so it was reverted.  That will probably have to wait unto 3.13-rc1 to
        get accepted as it's still being discussed"
      
      * tag 'char-misc-3.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        Revert "Drivers: hv: vmbus: Fix a bug in channel rescind code"
        Drivers: hv: vmbus: Fix a bug in channel rescind code
        iio:buffer: Free active scan mask in iio_disable_all_buffers()
        iio: frequency: adf4350: add missing clk_disable_unprepare() on error in adf4350_probe()
        w1 - call request_module with w1 master mutex unlocked
        w1 - fix fops in w1_bus_notify
      66eb411e
    • Linus Torvalds's avatar
      Merge tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 630db0e3
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "All reasonably small fixes as rc6: a HD-audio mic fix, a us122l mmap
        regression fix, and kernel memory leak fix in hdsp driver.  Hopefully
        this will be the last pull request for 3.12..."
      
      * tag 'sound-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hdsp - info leak in snd_hdsp_hwdep_ioctl()
        ALSA: us122l: Fix pcm_usb_stream mmapping regression
        ALSA: hda - Fix inverted internal mic not indicated on some machines
      630db0e3
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · b2118ea9
      Linus Torvalds authored
      Pull apparmor fixes from James Morris:
       "A couple more regressions fixed"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        apparmor: fix bad lock balance when introspecting policy
        apparmor: fix memleak of the profile hash
      b2118ea9
    • Greg Kroah-Hartman's avatar
      Merge tag 'iio-fixes-for-3.12c' of... · e13cef8d
      Greg Kroah-Hartman authored
      Merge tag 'iio-fixes-for-3.12c' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus
      
      Jonathan writes:
      
      Third set of IIO fixes for the 3.12 cycle.
      
      Two little ones this time:
      
      1) A missing clk_unprepare in adf4350.
      2) A missing free of the active_scan_mask when iio_disable_all_buffers is
      called during an unexpected device removal.  This leak was introduced by
      the fix
      a87c82e4 iio: Stop sampling when the device is removed
      and hence is a regression fix.
      e13cef8d
    • Guenter Roeck's avatar
      usb: usb_phy_gen: refine conditional declaration of usb_nop_xceiv_register · 94468783
      Guenter Roeck authored
      Commit 3fa4d734 (usb: phy: rename nop_usb_xceiv => usb_phy_gen_xceiv)
      changed the conditional around the declaration of usb_nop_xceiv_register
      from
      	#if defined(CONFIG_NOP_USB_XCEIV) ||
      		(defined(CONFIG_NOP_USB_XCEIV_MODULE) && defined(MODULE))
      to
      	#if IS_ENABLED(CONFIG_NOP_USB_XCEIV)
      
      While that looks the same, it is semantically different. The first expression
      is true if CONFIG_NOP_USB_XCEIV is built as module and if the including
      code is built as module. The second expression is true if code depending on
      CONFIG_NOP_USB_XCEIV if built as module or into the kernel.
      
      As a result, the arm:allmodconfig build fails with
      
      arch/arm/mach-omap2/built-in.o: In function `omap3_evm_init':
      arch/arm/mach-omap2/board-omap3evm.c:703: undefined reference to
      	`usb_nop_xceiv_register'
      
      Fix the problem by reverting to the old conditional.
      
      Cc: Josh Boyer <jwboyer@redhat.com>
      Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      94468783
    • Greg Kroah-Hartman's avatar
      Revert "Drivers: hv: vmbus: Fix a bug in channel rescind code" · b762799d
      Greg Kroah-Hartman authored
      This reverts commit 90d33f3e as it's not
      the correct fix for this issue, and it causes a build warning to be
      added to the kernel tree.
      
      Cc: K. Y. Srinivasan <kys@microsoft.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
      b762799d
    • Rafael J. Wysocki's avatar
      ACPI / PM: Drop two functions that are not used any more · 2421ad48
      Rafael J. Wysocki authored
      Two functions defined in device_pm.c, acpi_dev_pm_add_dependent()
      and acpi_dev_pm_remove_dependent(), have no callers and may be
      dropped, so drop them.
      
      Moreover, they are the only functions adding entries to and removing
      entries from the power_dependent list in struct acpi_device, so drop
      that list too.
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      2421ad48
    • Aaron Lu's avatar
      ATA / ACPI: remove power dependent device handling · b08fc109
      Aaron Lu authored
      Previously, we wanted SCSI devices corrsponding to ATA devices to
      be runtime resumed when the power resource for those ATA device was
      turned on by some other device, so we added the SCSI device to the
      dependent device list of the ATA device's ACPI node.  However, this
      code has no effect after commit 41863fce (ACPI / power: Drop automaitc
      resume of power resource dependent devices) and the mechanism it was
      supposed to implement is regarded as a bad idea now, so drop it.
      
      [rjw: Changelog]
      Signed-off-by: default avatarAaron Lu <aaron.lu@intel.com>
      Signed-off-by: default avatarRafael J. Wysocki <rafael.j.wysocki@intel.com>
      b08fc109
    • Linus Torvalds's avatar
      Merge branch 'akpm' (fixes from Andrew Morton) · 056cdce0
      Linus Torvalds authored
      Merge misc fixes from Andrew Morton.
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (21 commits)
        mm: revert mremap pud_free anti-fix
        mm: fix BUG in __split_huge_page_pmd
        swap: fix set_blocksize race during swapon/swapoff
        procfs: call default get_unmapped_area on MMU-present architectures
        procfs: fix unintended truncation of returned mapped address
        writeback: fix negative bdi max pause
        percpu_refcount: export symbols
        fs: buffer: move allocation failure loop into the allocator
        mm: memcg: handle non-error OOM situations more gracefully
        tools/testing/selftests: fix uninitialized variable
        block/partitions/efi.c: treat size mismatch as a warning, not an error
        mm: hugetlb: initialize PG_reserved for tail pages of gigantic compound pages
        mm/zswap: bugfix: memory leak when re-swapon
        mm: /proc/pid/pagemap: inspect _PAGE_SOFT_DIRTY only on present pages
        mm: migration: do not lose soft dirty bit if page is in migration state
        gcov: MAINTAINERS: Add an entry for gcov
        mm/hugetlb.c: correct missing private flag clearing
        mm/vmscan.c: don't forget to free shrinker->nr_deferred
        ipc/sem.c: synchronize semop and semctl with IPC_RMID
        ipc: update locking scheme comments
        ...
      056cdce0
    • Hugh Dickins's avatar
      mm: revert mremap pud_free anti-fix · 57a8f0cd
      Hugh Dickins authored
      Revert commit 1ecfd533 ("mm/mremap.c: call pud_free() after fail
      calling pmd_alloc()").
      
      The original code was correct: pud_alloc(), pmd_alloc(), pte_alloc_map()
      ensure that the pud, pmd, pt is already allocated, and seldom do they
      need to allocate; on failure, upper levels are freed if appropriate by
      the subsequent do_munmap().  Whereas commit 1ecfd533 did an
      unconditional pud_free() of a most-likely still-in-use pud: saved only
      by the near-impossiblity of pmd_alloc() failing.
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Cc: Chen Gang <gang.chen@asianux.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      57a8f0cd
    • Hugh Dickins's avatar
      mm: fix BUG in __split_huge_page_pmd · 750e8165
      Hugh Dickins authored
      Occasionally we hit the BUG_ON(pmd_trans_huge(*pmd)) at the end of
      __split_huge_page_pmd(): seen when doing madvise(,,MADV_DONTNEED).
      
      It's invalid: we don't always have down_write of mmap_sem there: a racing
      do_huge_pmd_wp_page() might have copied-on-write to another huge page
      before our split_huge_page() got the anon_vma lock.
      
      Forget the BUG_ON, just go back and try again if this happens.
      Signed-off-by: default avatarHugh Dickins <hughd@google.com>
      Acked-by: default avatarKirill A. Shutemov <kirill.shutemov@linux.intel.com>
      Cc: Andrea Arcangeli <aarcange@redhat.com>
      Cc: Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>
      Cc: David Rientjes <rientjes@google.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      750e8165
    • Krzysztof Kozlowski's avatar
      swap: fix set_blocksize race during swapon/swapoff · 5b808a23
      Krzysztof Kozlowski authored
      Fix race between swapoff and swapon.  Swapoff used old_block_size from
      swap_info outside of swapon_mutex so it could be overwritten by
      concurrent swapon.
      
      The race has visible effect only if more than one swap block device
      exists with different block sizes (e.g.  /dev/sda1 with block size 4096
      and /dev/sdb1 with 512).  In such case it leads to setting the blocksize
      of swapped off device with wrong blocksize.
      
      The bug can be triggered with multiple concurrent swapoff and swapon:
      0. Swap for some device is on.
      1. swapoff:
      First the swapoff is called on this device and "struct swap_info_struct
      *p" is assigned. This is done under swap_lock however this lock is
      released for the call try_to_unuse().
      
      2. swapon:
      After the assignment above (and before acquiring swapon_mutex &
      swap_lock by swapoff) the swapon is called on the same device.
      The p->old_block_size is assigned to the value of block_size the device.
      This block size should be the same as previous but sometimes it is not.
      The swapon ends successfully.
      
      3. swapoff:
      Swapoff resumes, grabs the locks and mutex and continues to disable this
      swap device. Now it sets the block size to value taken from swap_info
      which was overwritten by swapon in 2.
      Signed-off-by: default avatarKrzysztof Kozlowski <k.kozlowski@samsung.com>
      Reported-by: default avatarWeijie Yang <weijie.yang.kh@gmail.com>
      Cc: Bob Liu <bob.liu@oracle.com>
      Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
      Cc: Shaohua Li <shli@fusionio.com>
      Cc: Minchan Kim <minchan@kernel.org>
      Acked-by: default avatarHugh Dickins <hughd@google.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      5b808a23
    • HATAYAMA Daisuke's avatar
      procfs: call default get_unmapped_area on MMU-present architectures · fad1a86e
      HATAYAMA Daisuke authored
      Commit c4fe2448 ("sparc: fix PCI device proc file mmap(2)") added
      proc_reg_get_unmapped_area in proc_reg_file_ops and
      proc_reg_file_ops_no_compat, by which now mmap always returns EIO if
      get_unmapped_area method is not defined for the target procfs file,
      which causes regression of mmap on /proc/vmcore.
      
      To address this issue, like get_unmapped_area(), call default
      current->mm->get_unmapped_area on MMU-present architectures if
      pde->proc_fops->get_unmapped_area, i.e.  the one in actual file
      operation in the procfs file, is not defined.
      Reported-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarHATAYAMA Daisuke <d.hatayama@jp.fujitsu.com>
      Cc: Alexey Dobriyan <adobriyan@gmail.com>
      Cc: David S. Miller <davem@davemloft.net>
      Tested-by: default avatarMichael Holzheu <holzheu@linux.vnet.ibm.com>
      Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      fad1a86e