1. 19 Oct, 2013 2 commits
  2. 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
  3. 17 Oct, 2013 31 commits