1. 30 4月, 2014 4 次提交
  2. 28 4月, 2014 3 次提交
  3. 25 4月, 2014 5 次提交
  4. 24 4月, 2014 4 次提交
  5. 23 4月, 2014 5 次提交
  6. 22 4月, 2014 8 次提交
  7. 21 4月, 2014 8 次提交
    • L
      Merge tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4 · 9ac03675
      Linus Torvalds 提交于
      Pull ext4 fixes from Ted Ts'o:
       "These are regression and bug fixes for ext4.
      
        We had a number of new features in ext4 during this merge window
        (ZERO_RANGE and COLLAPSE_RANGE fallocate modes, renameat, etc.) so
        there were many more regression and bug fixes this time around.  It
        didn't help that xfstests hadn't been fully updated to fully stress
        test COLLAPSE_RANGE until after -rc1"
      
      * tag 'ext4_for_linus_stable' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4: (31 commits)
        ext4: disable COLLAPSE_RANGE for bigalloc
        ext4: fix COLLAPSE_RANGE failure with 1KB block size
        ext4: use EINVAL if not a regular file in ext4_collapse_range()
        ext4: enforce we are operating on a regular file in ext4_zero_range()
        ext4: fix extent merging in ext4_ext_shift_path_extents()
        ext4: discard preallocations after removing space
        ext4: no need to truncate pagecache twice in collapse range
        ext4: fix removing status extents in ext4_collapse_range()
        ext4: use filemap_write_and_wait_range() correctly in collapse range
        ext4: use truncate_pagecache() in collapse range
        ext4: remove temporary shim used to merge COLLAPSE_RANGE and ZERO_RANGE
        ext4: fix ext4_count_free_clusters() with EXT4FS_DEBUG and bigalloc enabled
        ext4: always check ext4_ext_find_extent result
        ext4: fix error handling in ext4_ext_shift_extents
        ext4: silence sparse check warning for function ext4_trim_extent
        ext4: COLLAPSE_RANGE only works on extent-based files
        ext4: fix byte order problems introduced by the COLLAPSE_RANGE patches
        ext4: use i_size_read in ext4_unaligned_aio()
        fs: disallow all fallocate operation on active swapfile
        fs: move falloc collapse range check into the filesystem methods
        ...
      9ac03675
    • A
      um: Memory corruption on startup · 0565103d
      Anton Ivanov 提交于
      The reverse case of this race (you must msync before read) is
      well known. This is the not so common one.
      
      It can be triggered only on systems which do a lot of task
      switching and only at UML startup. If you are starting 200+ UMLs
      ~ 0.5% will always die without this fix.
      Signed-off-by: NAnton Ivanov <antivano@cisco.com>
      [rw: minor whitespace fixes]
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      0565103d
    • A
      um: Missing pipe handling · 9fcb663b
      Anton Ivanov 提交于
      UML does not handle sigpipe. As a result when running it under
      expect or redirecting the IO from the console to an external program
      it will crash if the program stops or exits.
      Signed-off-by: NAnton Ivanov <antivano@cisco.com>
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      9fcb663b
    • T
      uml: Simplify tempdir logic. · 0d71832e
      Tristan Schmelcher 提交于
      Inferring the mount hierarchy correctly from /proc/mounts is hard when MS_MOVE
      may have been used, and the previous code did it wrongly. This change simplifies
      the logic to only require that /dev/shm be _on_ tmpfs (which can be checked
      trivially with statfs) rather than that it be a _mountpoint_ of tmpfs, since
      there isn't a compelling reason to be that strict. We also now check for tmpfs
      on whatever directory we ultimately use so that the user is better informed.
      
      This change also moves the more standard TMPDIR environment variable check ahead
      of the others.
      
      Applies to 3.12.
      Signed-off-by: NTristan Schmelcher <tschmelcher@google.com>
      Signed-off-by: NRichard Weinberger <richard@nod.at>
      0d71832e
    • L
      Linux 3.15-rc2 · a798c10f
      Linus Torvalds 提交于
      a798c10f
    • L
      Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma · 372feacb
      Linus Torvalds 提交于
      Pull slave-dmaengine fixes from Vinod Koul:
       "Back from long weekend here in India and now the time to send fixes
        for slave dmaengine.
         - Dan's fix of sirf xlate code
         - Jean's fix for timberland
         - edma fixes by Sekhar for SG handling and Yuan for changing init
           call"
      
      * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma:
        dma: fix eDMA driver as a subsys_initcall
        dmaengine: sirf: off by one in of_dma_sirfsoc_xlate()
        platform: Fix timberdale dependencies
        dma: edma: fix incorrect SG list handling
      372feacb
    • L
      Merge tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu · 5269519f
      Linus Torvalds 提交于
      Pull iommu fixes from Joerg Roedel:
       "Fixes for regressions:
      
         - fix wrong IOMMU enumeration causing some SCSI device drivers
           initialization failures
         - ARM-SMMU fixes for a panic condition and a wrong return value"
      
      * tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
        iommu/arm-smmu: fix panic in arm_smmu_alloc_init_pte
        iommu/arm-smmu: Return 0 on unmap failure
        iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors
        iommu/vt-d: Fix get_domain_for_dev() handling of upstream PCIe bridges
        iommu/vt-d: fix memory leakage caused by commit ea8ea460
      5269519f
    • L
      Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 200bde27
      Linus Torvalds 提交于
      Pull perf tooling fixes from Ingo Molnar:
       "Three small tooling fixes"
      
      * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        perf tools: Improve error reporting
        perf tools: Adjust symbols in VDSO
        perf kvm: Fix 'Min time' counting in report command
      200bde27
  8. 20 4月, 2014 3 次提交