1. 13 Jun, 2009 11 commits
    • Linus Torvalds's avatar
      Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip · a2ee2981
      Linus Torvalds authored
      * 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (80 commits)
        x86, mce: Add boot options for corrected errors
        x86, mce: Fix mce printing
        x86, mce: fix for mce counters
        x86, mce: support action-optional machine checks
        x86, mce: define MCE_VECTOR
        x86, mce: rename mce_notify_user to mce_notify_irq
        x86: fix panic with interrupts off (needed for MCE)
        x86, mce: export MCE severities coverage via debugfs
        x86, mce: implement new status bits
        x86, mce: print header/footer only once for multiple MCEs
        x86, mce: default to panic timeout for machine checks
        x86, mce: improve mce_get_rip
        x86, mce: make non Monarch panic message "Fatal machine check" too
        x86, mce: switch x86 machine check handler to Monarch election.
        x86, mce: implement panic synchronization
        x86, mce: implement bootstrapping for machine check wakeups
        x86, mce: check early in exception handler if panic is needed
        x86, mce: add table driven machine check grading
        x86, mce: remove TSC print heuristic
        x86, mce: log corrected errors when panicing
        ...
      a2ee2981
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs · 7603ef03
      Linus Torvalds authored
      * 'for-linus' of git://oss.sgi.com/xfs/xfs: (23 commits)
        xfs: fix small mismerge in xfs_vn_mknod
        xfs: fix warnings with CONFIG_XFS_QUOTA disabled
        xfs: fix freeing memory in xfs_getbmap()
        xfs: use generic Posix ACL code
        xfs: remove SYNC_BDFLUSH
        xfs: remove SYNC_IOWAIT
        xfs: split xfs_sync_inodes
        xfs: use generic inode iterator in xfs_qm_dqrele_all_inodes
        xfs: introduce a per-ag inode iterator
        xfs: remove unused parameter from xfs_reclaim_inodes
        xfs: factor out inode validation for sync
        xfs: split inode flushing from xfs_sync_inodes_ag
        xfs: split inode data writeback from xfs_sync_inodes_ag
        xfs: kill xfs_qmops
        xfs: validate quota log items during log recovery
        xfs: update max log size
        xfs: prevent deadlock in xfs_qm_shake()
        xfs: fix overflow in xfs_growfs_data_private
        xfs: fix double unlock in xfs_swap_extents()
        xfs: fix getbmap vs mmap deadlock
        ...
      7603ef03
    • Linus Torvalds's avatar
      Merge branch 'docs-next' of git://git.lwn.net/linux-2.6 · 1904187a
      Linus Torvalds authored
      * 'docs-next' of git://git.lwn.net/linux-2.6:
        Document the debugfs API
        Documentation: Add "how to write a good patch summary" to SubmittingPatches
        SubmittingPatches: fix typo
        docs: Encourage better changelogs in the development process document
        Document Reported-by in SubmittingPatches
      1904187a
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 32f44d62
      Linus Torvalds authored
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (35 commits)
        hwrng: timeriomem - Fix potential oops (request_mem_region/__devinit)
        crypto: api - Use formatting of module name
        crypto: testmgr - Allow hash test vectors longer than a page
        crypto: testmgr - Check all test vector lengths
        crypto: hifn_795x - fix __dev{init,exit} markings
        crypto: tcrypt - Do not exit on success in fips mode
        crypto: compress - Return produced bytes in crypto_{,de}compress_{update,final}
        hwrng: via_rng - Support VIA Nano hardware RNG on X86_64 builds
        hwrng: via_rng - Support VIA Nano hardware RNG
        hwrng: via_rng - The VIA Hardware RNG driver is for the CPU, not Chipset
        crypto: testmgr - Skip algs not flagged fips_allowed in fips mode
        crypto: testmgr - Mark algs allowed in fips mode
        crypto: testmgr - Add ctr(aes) test vectors
        crypto: testmgr - Dynamically allocate xbuf and axbuf
        crypto: testmgr - Print self-test pass notices in fips mode
        crypto: testmgr - Catch base cipher self-test failures in fips mode
        crypto: testmgr - Add ansi_cprng test vectors
        crypto: testmgr - Add infrastructure for ansi_cprng self-tests
        crypto: testmgr - Add self-tests for rfc4309(ccm(aes))
        crypto: testmgr - Handle AEAD test vectors expected to fail verification
        ...
      32f44d62
    • Felix Blyakher's avatar
    • Christoph Hellwig's avatar
      xfs: fix small mismerge in xfs_vn_mknod · e83f1eb6
      Christoph Hellwig authored
      Identation got messed up when merging the current_umask changes with
      the generic ACL support.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reviewed-by: default avatarFelix Blyakher <felixb@sgi.com>
      Signed-off-by: default avatarFelix Blyakher <felixb@sgi.com>
      e83f1eb6
    • Christoph Hellwig's avatar
      xfs: fix warnings with CONFIG_XFS_QUOTA disabled · 493b87e5
      Christoph Hellwig authored
      Fix warnings about unitialized dquot variables by making sure
      xfs_qm_vop_dqalloc touches it even when quotas are disabled.
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Reviewed-by: default avatarFelix Blyakher <felixb@sgi.com>
      Signed-off-by: default avatarFelix Blyakher <felixb@sgi.com>
      493b87e5
    • Linus Torvalds's avatar
      Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs · f3ad1165
      Linus Torvalds authored
      * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs:
        configfs: Rework configfs_depend_item() locking and make lockdep happy
        configfs: Silence lockdep on mkdir() and rmdir()
      f3ad1165
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6 · d645727b
      Linus Torvalds authored
      * 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6: (30 commits)
        [S390] wire up sys_perf_counter_open
        [S390] wire up sys_rt_tgsigqueueinfo
        [S390] ftrace: add system call tracer support
        [S390] ftrace: add function graph tracer support
        [S390] ftrace: add function trace mcount test support
        [S390] ftrace: add dynamic ftrace support
        [S390] kprobes: use probe_kernel_write
        [S390] maccess: arch specific probe_kernel_write() implementation
        [S390] maccess: add weak attribute to probe_kernel_write
        [S390] profile_tick called twice
        [S390] dasd: forward internal errors to dasd_sleep_on caller
        [S390] dasd: sync after async probe
        [S390] dasd: check_characteristics cleanup
        [S390] dasd: no High Performance FICON in 31-bit mode
        [S390] dcssblk: revert devt conversion
        [S390] qdio: fix access beyond ARRAY_SIZE of irq_ptr->{in,out}put_qs
        [S390] vmalloc: add vmalloc kernel parameter support
        [S390] uaccess: use might_fault() instead of might_sleep()
        [S390] 3270: lock dependency fixes
        [S390] 3270: do not register with tty_register_device
        ...
      d645727b
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic · cd166bd0
      Linus Torvalds authored
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic:
        add generic lib/checksum.c
        asm-generic: add a generic uaccess.h
        asm-generic: add generic NOMMU versions of some headers
        asm-generic: add generic atomic.h and io.h
        asm-generic: add legacy I/O header files
        asm-generic: add generic versions of common headers
        asm-generic: make bitops.h usable
        asm-generic: make pci.h usable directly
        asm-generic: make get_rtc_time overridable
        asm-generic: rename page.h and uaccess.h
        asm-generic: rename atomic.h to atomic-long.h
        asm-generic: add a generic unistd.h
        asm-generic: add generic ABI headers
        asm-generic: add generic sysv ipc headers
        asm-generic: introduce asm/bitsperlong.h
        asm-generic: rename termios.h, signal.h and mman.h
      cd166bd0
    • Linus Torvalds's avatar
      Merge branch 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6 · 6b702462
      Linus Torvalds authored
      * 'drm-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6: (50 commits)
        drm: include kernel list header file in hashtab header
        drm: Export hash table functionality.
        drm: Split out the mm declarations in a separate header. Add atomic operations.
        drm/radeon: add support for RV790.
        drm/radeon: add rv740 drm support.
        drm_calloc_large: check right size, check integer overflow, use GFP_ZERO
        drm: Eliminate magic I2C frobbing when reading EDID
        drm/i915: duplicate desired mode for use by fbcon.
        drm/via: vfree() no need checking before calling it
        drm: Replace DRM_DEBUG with DRM_DEBUG_DRIVER in i915 driver
        drm: Replace DRM_DEBUG with DRM_DEBUG_MODE in drm_mode
        drm/i915: Replace DRM_DEBUG with DRM_DEBUG_KMS in intel_sdvo
        drm/i915: replace DRM_DEBUG with DRM_DEBUG_KMS in intel_lvds
        drm: add separate drm debugging levels
        radeon: remove _DRM_DRIVER from the preadded sarea map
        drm: don't associate _DRM_DRIVER maps with a master
        drm: simplify kcalloc() call to kzalloc().
        intelfb: fix spelling of "CLOCK"
        drm: fix LOCK_TEST_WITH_RETURN macro
        drm/i915: Hook connector to encoder during load detection (fixes tv/vga detect)
        ...
      6b702462
  2. 12 Jun, 2009 29 commits