1. 23 May, 2014 8 commits
  2. 21 May, 2014 25 commits
    • Linus Torvalds's avatar
      Linux 3.15-rc6 · 4b660a7f
      Linus Torvalds authored
      4b660a7f
    • Linus Torvalds's avatar
      Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc · 6538d625
      Linus Torvalds authored
      Pull two powerpc fixes from Ben Herrenschmidt:
       "Here are a couple of fixes for 3.15.  One from Anton fixes a nasty
        regression I introduced when trying to fix a loss of irq_work whose
        consequences is that we can completely lose timer interrupts on a
        CPU... not pretty.
      
        The other one is a change to our PCIe reset hook to use a firmware
        call instead of direct config space accesses to trigger a fundamental
        reset on the root port.  This is necessary so that the FW gets a
        chance to disable the link down error monitoring, which would
        otherwise trip and cause subsequent fatal EEH error"
      
      * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc:
        powerpc: irq work racing with timer interrupt can result in timer interrupt hang
        powerpc/powernv: Reset root port in firmware
      6538d625
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs · 11da37b2
      Linus Torvalds authored
      Pull two btrfs fixes from Chris Mason:
       "This has two fixes that we've been testing for 3.16, but since both
        are safe and fix real bugs, it makes sense to send for 3.15 instead"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs:
        Btrfs: send, fix incorrect ref access when using extrefs
        Btrfs: fix EIO on reading file after ioctl clone works on it
      11da37b2
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client · 30625569
      Linus Torvalds authored
      Pull two ceph fixes from Sage Weil:
       "The first patch fixes a problem when we have a page count of 0 for
        sendpage which is triggered by zfs.  The second fixes a bug in CRUSH
        that was resolved in the userland code a while back but fell through
        the cracks on the kernel side"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client:
        crush: decode and initialize chooseleaf_vary_r
        libceph: fix corruption when using page_count 0 page in rbd
      30625569
    • Linus Torvalds's avatar
      Merge tag 'xfs-for-linus-3.15-rc6' of git://oss.sgi.com/xfs/xfs · 5e9d9fc4
      Linus Torvalds authored
      Pull xfs fixes from Dave Chinner:
       "Code inspection of the XFS error number sign translations found a
        bunch of issues, including returning incorrectly signed errors for
        some data integrity operations.
      
        These leak to userspace and result in applications not getting the
        errors correctly reported.  Hence they need fixing sooner rather than
        later.
      
        A couple of the bugs are in data integrity operations, a couple more
        are in the new COLLAPSE_RANGE code.  One of these came in through a
        recent ext4 merge and so I had to update the base tree to 3.15-rc5
        before fixing the issues"
      
      * tag 'xfs-for-linus-3.15-rc6' of git://oss.sgi.com/xfs/xfs:
        xfs: list_lru_init returns a negative error
        xfs: negate xfs_icsb_init_counters error value
        xfs: negate mount workqueue init error value
        xfs: fix wrong err sign on xfs_set_acl()
        xfs: fix wrong errno from xfs_initxattrs
        xfs: correct error sign on COLLAPSE_RANGE errors
        xfs: xfs_commit_metadata returns wrong errno
        xfs: fix incorrect error sign in xfs_file_aio_read
        xfs: xfs_dir_fsync() returns positive errno
      5e9d9fc4
    • Linus Torvalds's avatar
      Merge branch 'renameat2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 80932ec1
      Linus Torvalds authored
      Pull renameat2 arch support from Miklos Szeredi:
       "I've collected architecture patches for the renameat2 syscall that
        maintainers acked and/or asked me to queue.
      
        This adds architecture support for the renameat2 syscall to m68k,
        parisc, ia64 and through asm-generic to arc, arm64, c6x, hexagon,
        metag, openrisc, score, tile, unicore32"
      
      * 'renameat2' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        scripts/checksyscalls.sh: Make renameat optional
        asm-generic: Add renameat2 syscall
        ia64: add renameat2 syscall
        parisc: add renameat2 syscall
        m68k: add renameat2 syscall
      80932ec1
    • Linus Torvalds's avatar
      Merge tag 'iommu-fixes-v3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 989d216f
      Linus Torvalds authored
      Pull iommu fixes from Joerg Roedel:
       "Three fixes for the AMD IOMMU driver:
         - fix a locking issue around get_user_pages()
         - fix two issues with device aliasing and exclusion range handling"
      
      * tag 'iommu-fixes-v3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/amd: fix enabling exclusion range for an exact device
        iommu/amd: Take mmap_sem when calling get_user_pages
        iommu/amd: Fix interrupt remapping for aliased devices
      989d216f
    • Linus Torvalds's avatar
      Merge tag 'stable/for-linus-3.15-rc5-tag' of... · 677d1bb0
      Linus Torvalds authored
      Merge tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft
      
      Pull iscsi_ibft fix from Konrad Rzeszutek Wilk:
       "Fix iBFT regression on Broadcom NICs introduced in 3.2"
      
      * tag 'stable/for-linus-3.15-rc5-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/konrad/ibft:
        iscsi_ibft: Fix finding Broadcom specific ibft sign
      677d1bb0
    • Linus Torvalds's avatar
      Merge tag 'renesas-sh-drivers-for-v3.15' of... · f6ce579d
      Linus Torvalds authored
      Merge tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas
      
      Pull SH driver fix from Simon Horman:
       "Compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI
      
        This resolves a regression introduced in v3.14 by commit bf98c1ea
        ("ARM: Rename ARCH_SHMOBILE to ARCH_SHMOBILE_LEGACY")"
      
      * tag 'renesas-sh-drivers-for-v3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas:
        drivers: sh: compile drivers/sh/pm_runtime.c if ARCH_SHMOBILE_MULTI
      f6ce579d
    • Linus Torvalds's avatar
      Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · fba69f04
      Linus Torvalds authored
      Pull media fixes from Mauro Carvalho Chehab:
       "Most of the changes are drivers fixes (rtl28xuu, fc2580, ov7670,
        davinci, gspca, s5p-fimc and s5c73m3).
      
        There is also a compat32 fix and one infoleak fixup at the media
        controller"
      
      * 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
        [media] V4L2: fix VIDIOC_CREATE_BUFS in 64- / 32-bit compatibility mode
        [media] V4L2: ov7670: fix a wrong index, potentially Oopsing the kernel from user-space
        [media] media-device: fix infoleak in ioctl media_enum_entities()
        [media] fc2580: fix tuning failure on 32-bit arch
        [media] Prefer gspca_sonixb over sn9c102 for all devices
        [media] media: davinci: vpfe: make sure all the buffers unmapped and released
        [media] staging: media: davinci: vpfe: make sure all the buffers are released
        [media] media: davinci: vpbe_display: fix releasing of active buffers
        [media] media: davinci: vpif_display: fix releasing of active buffers
        [media] media: davinci: vpif_capture: fix releasing of active buffers
        [media] s5p-fimc: Fix YUV422P depth
        [media] s5c73m3: Add missing rename of v4l2_of_get_next_endpoint() function
        [media] rtl28xxu: silence error log about disabled rtl2832_sdr module
        [media] rtl28xxu: do not hard depend on staging SDR module
      fba69f04
    • Linus Torvalds's avatar
      Merge tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · 84e12d99
      Linus Torvalds authored
      Pull staging driver fixes from Greg KH:
       "Here are five staging driver fixes for 3.15-rc6 that resolve some
        reported issues.  They are for the imx and rtl8723au drivers"
      
      * tag 'staging-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
        staging: rtl8723au: Do not reset wdev->iftype in netdev_close()
        staging: rtl8723au: Use correct pipe type for USB interrupts
        imx-drm: imx-tve: correct DDC property name to 'ddc-i2c-bus'
        imx-drm: imx-drm-core: skip components whose parent device is disabled
        imx-drm: imx-drm-core: fix imx_drm_encoder_get_mux_id
      84e12d99
    • Linus Torvalds's avatar
      Merge tag 'driver-core-3.15-rc6' of... · 439c6109
      Linus Torvalds authored
      Merge tag 'driver-core-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
      
      Pull driver core fixes from Greg KH:
       "Here are two driver core (well, sysfs) fixes for 3.15-rc6 that resolve
        some reported issues and a regression from 3.13"
      
      * tag 'driver-core-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
        sysfs: make sure read buffer is zeroed
        kernfs, sysfs, cgroup: restrict extra perm check on open to sysfs
      439c6109
    • Linus Torvalds's avatar
      Merge tag 'pci-v3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 957cf258
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
       "These are fixes for an SHPCHP hotplug regression, a "wait for pending
        transaction" problem (used in device reset paths), and an email
        address update.
      
        PCI device hotplug:
          - Fix SHPCHP bus speed mismatch issue (Marcel Apfelbaum)
      
        Miscellaneous:
          - Fix pci_wait_for_pending_transaction() (Gavin Shan)
          - Update email address (Ben Hutchings)"
      
      * tag 'pci-v3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: Wrong register used to check pending traffic
        PCI: shpchp: Check bridge's secondary (not primary) bus speed
        PCI: Update my email address
      957cf258
    • Linus Torvalds's avatar
      Merge tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random · b84293b2
      Linus Torvalds authored
      Pull /dev/random fix from Ted Ts'o:
       "This fixes a BUG_ON-causing regression that was introduced during the
        last merge window"
      
      * tag 'random_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/random:
        random: fix BUG_ON caused by accounting simplification
      b84293b2
    • Linus Torvalds's avatar
      Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux · 026d68be
      Linus Torvalds authored
      Pull clock framework fixes from Mike Turquette:
       "Clock framework and driver fixes, all of which fix user-visible
        regressions.
      
        As usual most fixes are for platform-specific clock drivers, but there
        are also two fixes to the clk core after recent changes to the way
        that clock unregistration is handled"
      
      * tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux:
        clk: tegra: Fix wrong value written to PLLE_AUX
        clk: shmobile: clk-mstp: change to using clock-indices
        clk: Fix slab corruption in clk_unregister()
        clk: Fix double free due to devm_clk_register()
        clk: socfpga: fix clock driver for 3.15
        clk: divider: Fix best div calculation for power-of-two and table dividers
        clk: bcm281xx: don't use unnamed structs or unions
      026d68be
    • Linus Torvalds's avatar
      Merge tag 'spi-v3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · b2e3432a
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "A few core fixes around outlying cases here, nothing that should
        affect most users but useful fixes.  The diffstat is rather larger
        than one might hope due some simple code motion in the fix for
        !CONFIG_DMA, the actual meaningful change is much smaller.
      
         - Fix handling of unsupported dual and quad mode support on slave
           registration so that drivers that can degrade gracefully do so,
           preventing regressions for drivers this is added.
         - Fix build in !CONFIG_DMA cases following addition of generic DMA
           mapping support.
         - Fix error handling for queue creation which due to wider kernel
           changes can be triggered more easily.
         - A couple of driver specific fixes"
      
      * tag 'spi-v3.15-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi/pxa2xx: Prevent DMA from transferring too many bytes
        spi: core: Don't destroy master queue if we fail to create it
        spi: qup: Fix return value checking for pm_runtime_get_sync()
        spi: core: Protect DMA code by #ifdef CONFIG_HAS_DMA
        spi: core: Ignore unsupported Dual/Quad Transfer Mode bits
      b2e3432a
    • Linus Torvalds's avatar
      Merge tag 'gpio-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · 081069ff
      Linus Torvalds authored
      Pull GPIO fixes from Linus Walleij:
       - fix a null pointer bug in the ICH6 chipset driver
       - fix device tree registration for the mcp23s08 driver
      
      * tag 'gpio-v3.15-3' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio:
        gpio: mcp23s08: Bug fix of SPI device tree registration.
        gpio: ich: set regs and reglen for i3100 and ich6 chipset
      081069ff
    • Linus Torvalds's avatar
      Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 06eb4cc2
      Linus Torvalds authored
      Pull more cgroup fixes from Tejun Heo:
       "Three more patches to fix cgroup_freezer breakage due to the recent
        cgroup internal locking changes - an operation cgroup_freezer was
        using now requires sleepable context and cgroup_freezer was invoking
        that while holding a spin lock.  cgroup_freezer was using an overly
        elaborate hierarchical locking scheme.
      
        While it's possible to convert the hierarchical spinlocks directly to
        mutexes, this patch simplifies the overall locking so that it uses a
        global mutex.  This has the added benefit of avoiding iterating
        potentially huge number of tasks under a spinlock.  While the patch is
        on the larger side in the devel cycle, the changes made are mostly
        straight-forward and the locking logic is a lot simpler afterwards"
      
      * 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: fix rcu_read_lock() leak in update_if_frozen()
        cgroup_freezer: replace freezer->lock with freezer_mutex
        cgroup: introduce task_css_is_root()
      06eb4cc2
    • Linus Torvalds's avatar
      Merge branch 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 6ab9028d
      Linus Torvalds authored
      Pull libata fixes from Tejun Heo:
       "Mostly device-specific fixes.  The only thing which isn't is the fix
        for zpodd oops-on-detach bug"
      
      * 'for-3.15-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata:
        ahci: imx: PLL clock needs 100us to settle down
        ata: pata_at91 only works on sam9
        libata: clean up ZPODD when a port is detached
        ahci: imx: software workaround for phy reset issue in resume
        ahci: imx: add namespace for register enums
        ahci: disable DEVSLP for Intel Valleyview
      6ab9028d
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 1f5518b4
      Linus Torvalds authored
      Pull crypto fixes from Herbert Xu:
       "This fixes a NULL pointer dereference on allocation failure in caam,
        as well as a regression in the ctr mode on s390 that was added with
        the recent concurrency fixes"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
        crypto: s390 - fix aes,des ctr mode concurrency finding.
        crypto: caam - add allocation failure handling in SPRINTFCAT macro
      1f5518b4
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · a7aa96a9
      Linus Torvalds authored
      Pull scsi target fixes from Nicholas Bellinger:
       "This series include:
      
         - Close race between iser-target network portal shutdown + accepting
           new connection logins (sagi)
         - Fix free-after-use regression in tcm_fc post conversion to
           percpu-ida pre-allocation (nab)
         - Explicitly disable Immediate + Unsolicited Data for iser-target
           connections when T10-PI is enabled (sagi + nab)
         - Allow pi_prot_type + emulate_write_cache attributes to be set to
           zero regardless of backend support (andy)
         - memory leak fix (mikulas)"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
        target: fix memory leak on XCOPY
        target: Don't allow setting WC emulation if device doesn't support
        iscsi-target: Disable Immediate + Unsolicited Data with ISER Protection
        tcm_fc: Fix free-after-use regression in ft_free_cmd
        iscsi-target: Change BUG_ON to REJECT in iscsit_process_nop_out
        Target/iscsi,iser: Avoid accepting transport connections during stop stage
        Target/iser: Fix iscsit_accept_np and rdma_cm racy flow
        Target/iser: Fix wrong connection requests list addition
        target: Allow non-supporting backends to set pi_prot_type to 0
      a7aa96a9
    • Linus Torvalds's avatar
      Merge branch 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux · b1400276
      Linus Torvalds authored
      Pull i2c fixes from Wolfram Sang:
       "Some I2C bugfixes for 3.15.  Typical stuff, I'd say"
      
      * 'i2c/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux:
        i2c: rcar: bail out on zero length transfers
        i2c: qup: Fix pm_runtime_get_sync usage
        i2c: s3c2410: resume race fix
        i2c: nomadik: Don't use IS_ERR for devm_ioremap
        i2c: designware: Mask all interrupts during i2c controller enable
      b1400276
    • Linus Torvalds's avatar
      Merge tag 'pm+acpi-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 478c7cf7
      Linus Torvalds authored
      Pull ACPI and power management fixes from Rafael Wysocki:
       "Still fixing regressions (partly by reverting commits that broke
        things for people), fixing other stable-candidate bugs and adding some
        blacklist entries for ACPI video and _OSI.
      
        Two ACPICA regression fixes (one recent and one for a 3.14 commit), a
        fix for an ACPI-related regression in TPM (introduced in 3.14), a
        revert of the ACPI AC driver conversion in 3.13 that went wrong for an
        unknown reason, two reverts of commits that attempted to remove an old
        user space interface in /proc and broke some utilities, in 3.13 too, a
        fix for a CPU hotplug bug in the ACPI processor driver (stable
        material), two (stable candidate) fixes for intel_pstate and a few new
        blacklist entries, mostly for systems that shipped with Windows 8.
      
        Specifics:
      
         - ACPICA fix for a stale pointer access introduced by a recent commit
           in the XSDT validation code from Lv Zheng.
      
         - ACPICA fix for the default value of the command line switch to
           favor 32-bit FADT addresses (in case there's a conflict between a
           64-bit and a 32-bit address).  The previous default was that the
           32-bit version would take precedence and we tried to change it to
           the other way around and it didn't work.  From Lv Zheng.
      
         - A TPM commit related to ACPI _DSM in 3.14 caused the driver to
           refuse to load if a specific _DSM was missing and that broke resume
           from system suspend on Chromebooks that require the TPM hardware to
           be restored to a working state during resume by the OS.  Restore
           the old behavior to load the driver if the _DSM in question is not
           present, but prevent it from using the feature the _DSM is for.
      
         - ACPI AC driver conversion in 3.13 broke thermal management on at
           least one machine and has to be reverted.  From Guenter Roeck.
      
         - Two reverts of 3.13 commits that attempted to remove the old ACPI
           battery interface in /proc, but turned out to break some utilities
           still using that interface.  From Lan Tianyu.
      
         - ACPI processor driver fix to prevent acpi_processor_add() from
           modifying the CPU device's .offline field which leads to breakage
           if the initial online of the CPU fails.  From Igor Mammedov.
      
         - Two intel_pstate fixes, one to take a BayTrail documentation update
           into account and one to avoid forcing the maximum P-state on init
           which causes CPU PM trouble on systems with P-states coordination
           when one of the CPU cores is initialized after an offline/online
           cycle triggered by user space.  Both stable candidates, from Dirk
           Brandewie.
      
         - Fix for the ACPI video DMI blacklist entry for Dell Inspiron 7520
           from Aaron Lu.
      
         - Two new ACPI video blacklist entries for machines shipping with
           Win8 that need to use native backlight so that it can be controlled
           in a usual way (which doesn't work otherwise due bugs in the ACPI
           tables) from Hans de Goede.
      
         - Two ACPI _OSI quirks for systems that need them to work correctly
           with Linux from Edward Lin and Hans de Goede"
      
      * tag 'pm+acpi-3.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI / video: Revert native brightness quirk for ThinkPad T530
        intel_pstate: remove setting P state to MAX on init
        ACPICA: Tables: Restore old behavor to favor 32-bit FADT addresses.
        ACPI / video: correct DMI tag for Dell Inspiron 7520
        intel_pstate: Set turbo VID for BayTrail
        ACPI / TPM: Fix resume regression on Chromebooks
        ACPI / proc: Do not say when /proc interfaces will be deleted in Kconfig
        ACPI / processor: do not mark present at boot but not onlined CPU as onlined
        ACPI: Revert "ACPI / AC: convert ACPI ac driver to platform bus"
        ACPI / blacklist: Add dmi_enable_osi_linux quirk for Asus EEE PC 1015PX
        ACPI: blacklist win8 OSI for Dell Inspiron 7737
        ACPI / video: Add use_native_backlight quirks for more systems
        ACPI: Revert "ACPI / Battery: Remove battery's proc directory"
        ACPI: Revert "ACPI: Remove CONFIG_ACPI_PROCFS_POWER and cm_sbsc.c"
        ACPICA: Tables: Fix invalid pointer accesses in acpi_tb_parse_root_table().
      478c7cf7
    • Linus Torvalds's avatar
      Merge tag 'dm-3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm · 23de4a7a
      Linus Torvalds authored
      Pull device mapper fixes from Mike Snitzer:
       "A dm-crypt fix for a cpu hotplug crash that switches from using
        per-cpu data to a mempool allocation (which offers allocation with cpu
        locality, and there is no inter-cpu communication on slab allocation).
      
        A couple dm-thinp stable fixes to address "out-of-data-space" issues.
      
        A dm-multipath fix for a LOCKDEP warning introduced in 3.15-rc1"
      
      * tag 'dm-3.15-fixes-2' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
        dm mpath: fix lock order inconsistency in multipath_ioctl
        dm thin: add timeout to stop out-of-data-space mode holding IO forever
        dm thin: allow metadata commit if pool is in PM_OUT_OF_DATA_SPACE mode
        dm crypt: fix cpu hotplug crash by removing per-cpu structure
      23de4a7a
    • Linus Torvalds's avatar
      Merge tag 'dt-for-linus' of git://git.secretlab.ca/git/linux · 31a3fcab
      Linus Torvalds authored
      Pull device tree fixes from Grant Likely:
       "Drivercore bugfixes for v3.15
      
        This branch contains bug fixes important to get into v3.15.  There is
        a fix for modifying properties seen during early boot, a fix for an
        incorrect prototype when CONFIG_OF=n, and a couple of corrections to
        device tree memory nodes on a few platforms"
      
      * tag 'dt-for-linus' of git://git.secretlab.ca/git/linux:
        mips: dts: Fix missing device_type="memory" property in memory nodes
        arm: dts: Fix missing device_type="memory" for ste-ccu8540
        of: fix CONFIG_OF=n prototype of of_node_full_name()
        of: make of_update_property() usable earlier in the boot process
      31a3fcab
  3. 20 May, 2014 7 commits
    • Filipe Manana's avatar
      Btrfs: send, fix incorrect ref access when using extrefs · 51a60253
      Filipe Manana authored
      When running send, if an inode only has extended reference items
      associated to it and no regular references, send.c:get_first_ref()
      was incorrectly assuming the reference it found was of type
      BTRFS_INODE_REF_KEY due to use of the wrong key variable.
      This caused weird behaviour when using the found item has a regular
      reference, such as weird path string, and occasionally (when lucky)
      a crash:
      
      [  190.600652] general protection fault: 0000 [#1] SMP DEBUG_PAGEALLOC
      [  190.600994] Modules linked in: btrfs xor raid6_pq binfmt_misc nfsd auth_rpcgss oid_registry nfs_acl nfs lockd fscache sunrpc psmouse serio_raw evbug pcspkr i2c_piix4 e1000 floppy
      [  190.602565] CPU: 2 PID: 14520 Comm: btrfs Not tainted 3.13.0-fdm-btrfs-next-26+ #1
      [  190.602728] Hardware name: Bochs Bochs, BIOS Bochs 01/01/2011
      [  190.602868] task: ffff8800d447c920 ti: ffff8801fa79e000 task.ti: ffff8801fa79e000
      [  190.603030] RIP: 0010:[<ffffffff813266b4>]  [<ffffffff813266b4>] memcpy+0x54/0x110
      [  190.603262] RSP: 0018:ffff8801fa79f880  EFLAGS: 00010202
      [  190.603395] RAX: ffff8800d4326e3f RBX: 000000000000036a RCX: ffff880000000000
      [  190.603553] RDX: 000000000000032a RSI: ffe708844042936a RDI: ffff8800d43271a9
      [  190.603710] RBP: ffff8801fa79f8c8 R08: 00000000003a4ef0 R09: 0000000000000000
      [  190.603867] R10: 793a4ef09f000000 R11: 9f0000000053726f R12: ffff8800d43271a9
      [  190.604020] R13: 0000160000000000 R14: ffff8802110134f0 R15: 000000000000036a
      [  190.604020] FS:  00007fb423d09b80(0000) GS:ffff880216200000(0000) knlGS:0000000000000000
      [  190.604020] CS:  0010 DS: 0000 ES: 0000 CR0: 000000008005003b
      [  190.604020] CR2: 00007fb4229d4b78 CR3: 00000001f5d76000 CR4: 00000000000006e0
      [  190.604020] Stack:
      [  190.604020]  ffffffffa01f4d49 ffff8801fa79f8f0 00000000000009f9 ffff8801fa79f8c8
      [  190.604020]  00000000000009f9 ffff880211013260 000000000000f971 ffff88021147dba8
      [  190.604020]  00000000000009f9 ffff8801fa79f918 ffffffffa02367f5 ffff8801fa79f928
      [  190.604020] Call Trace:
      [  190.604020]  [<ffffffffa01f4d49>] ? read_extent_buffer+0xb9/0x120 [btrfs]
      [  190.604020]  [<ffffffffa02367f5>] fs_path_add_from_extent_buffer+0x45/0x60 [btrfs]
      [  190.604020]  [<ffffffffa0238806>] get_first_ref+0x1f6/0x210 [btrfs]
      [  190.604020]  [<ffffffffa0238994>] __get_cur_name_and_parent+0x174/0x3a0 [btrfs]
      [  190.604020]  [<ffffffff8118df3d>] ? kmem_cache_alloc_trace+0x11d/0x1e0
      [  190.604020]  [<ffffffffa0236674>] ? fs_path_alloc+0x24/0x60 [btrfs]
      [  190.604020]  [<ffffffffa0238c91>] get_cur_path+0xd1/0x240 [btrfs]
      (...)
      
      Steps to reproduce (either crash or some weirdness like an odd path string):
      
          mkfs.btrfs -f -O extref /dev/sdd
          mount /dev/sdd /mnt
      
          mkdir /mnt/testdir
          touch /mnt/testdir/foobar
      
          for i in `seq 1 2550`; do
              ln /mnt/testdir/foobar /mnt/testdir/foobar_link_`printf "%04d" $i`
          done
      
          ln /mnt/testdir/foobar /mnt/testdir/final_foobar_name
      
          rm -f /mnt/testdir/foobar
          for i in `seq 1 2550`; do
              rm -f /mnt/testdir/foobar_link_`printf "%04d" $i`
          done
      
          btrfs subvolume snapshot -r /mnt /mnt/mysnap
          btrfs send /mnt/mysnap -f /tmp/mysnap.send
      Signed-off-by: default avatarFilipe David Borba Manana <fdmanana@gmail.com>
      Signed-off-by: default avatarChris Mason <clm@fb.com>
      Reviewed-by: default avatarLiu Bo <bo.li.liu@oracle.com>
      51a60253
    • Liu Bo's avatar
      Btrfs: fix EIO on reading file after ioctl clone works on it · d3ecfcdf
      Liu Bo authored
      For inline data extent, we need to make its length aligned, otherwise,
      we can get a phantom extent map which confuses readpages() to return -EIO.
      
      This can be detected by xfstests/btrfs/035.
      Reported-by: default avatarDavid Disseldorp <ddiss@suse.de>
      Signed-off-by: default avatarLiu Bo <bo.li.liu@oracle.com>
      Signed-off-by: default avatarChris Mason <clm@fb.com>
      d3ecfcdf
    • James Hogan's avatar
      scripts/checksyscalls.sh: Make renameat optional · 68b77524
      James Hogan authored
      The new renameat2 syscall provides all the functionality of renameat
      with an additional flags argument, so make renameat optional so that
      future architectures can omit it without getting a warning.
      
      This patch doesn't affect existing architectures.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      Cc: linux-arch@vger.kernel.org
      68b77524
    • James Hogan's avatar
      asm-generic: Add renameat2 syscall · 63ba6000
      James Hogan authored
      Add the renameat2 syscall to the generic syscall list, which is used by the
      following architectures: arc, arm64, c6x, hexagon, metag, openrisc, score,
      tile, unicore32.
      Signed-off-by: default avatarJames Hogan <james.hogan@imgtec.com>
      Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      Cc: linux-arch@vger.kernel.org
      Cc: Vineet Gupta <vgupta@synopsys.com>
      Cc: Catalin Marinas <catalin.marinas@arm.com>
      Cc: Will Deacon <will.deacon@arm.com>
      Cc: linux-arm-kernel@lists.infradead.org
      Cc: Mark Salter <msalter@redhat.com>
      Cc: Aurelien Jacquiot <a-jacquiot@ti.com>
      Cc: Richard Kuo <rkuo@codeaurora.org>
      Cc: linux-hexagon@vger.kernel.org
      Cc: linux-metag@vger.kernel.org
      Cc: Jonas Bonn <jonas@southpole.se>
      Cc: Chen Liqin <liqin.linux@gmail.com>
      Cc: Lennox Wu <lennox.wu@gmail.com>
      Cc: Chris Metcalf <cmetcalf@tilera.com>
      Cc: Guan Xuetao <gxt@mprc.pku.edu.cn>
      63ba6000
    • Miklos Szeredi's avatar
      ia64: add renameat2 syscall · 3ca976a2
      Miklos Szeredi authored
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      Acked-by: default avatarTony Luck <tony.luck@intel.com>
      3ca976a2
    • Miklos Szeredi's avatar
      parisc: add renameat2 syscall · 18e480aa
      Miklos Szeredi authored
      Signed-off-by: default avatarMiklos Szeredi <mszeredi@suse.cz>
      Acked-by: default avatarHelge Deller <deller@gmx.de>
      18e480aa
    • Miklos Szeredi's avatar
      cc79f00f