diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 00:07:08 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-18 00:07:08 -0400 |
| commit | df58bee21ed218cb7dfb561a590b1bd2a99531cf (patch) | |
| tree | 885acc2720996707dacb1da5700051a8ed99c655 /Documentation | |
| parent | dcbf77b9e86e1726f5fbd01bb98820dac06d456e (diff) | |
| parent | e34e77ce348feac3c8c607774efb1f8a9262127d (diff) | |
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (21 commits)
x86, mce: Fix compilation with !CONFIG_DEBUG_FS in mce-severity.c
x86, mce: CE in last bank prevents panic by unknown MCE
x86, mce: Fake panic support for MCE testing
x86, mce: Move debugfs mce dir creating to mce.c
x86, mce: Support specifying raise mode for software MCE injection
x86, mce: Support specifying context for software mce injection
x86, mce: fix reporting of Thermal Monitoring mechanism enabled
x86, mce: remove never executed code
x86, mce: add missing __cpuinit tags
x86, mce: fix "mce" boot option handling for CONFIG_X86_NEW_MCE
x86, mce: don't log boot MCEs on Pentium M (model == 13) CPUs
x86: mce: Lower maximum number of banks to architecture limit
x86: mce: macros to compute banks MSRs
x86: mce: Move per bank data in a single datastructure
x86: mce: Move code in mce.c
x86: mce: Rename CONFIG_X86_NEW_MCE to CONFIG_X86_MCE
x86: mce: Remove old i386 machine check code
x86: mce: Update X86_MCE description in x86/Kconfig
x86: mce: Make CONFIG_X86_ANCIENT_MCE dependent on CONFIG_X86_MCE
x86, mce: use atomic_inc_return() instead of add by 1
...
Manually fixed up trivial conflicts:
Documentation/feature-removal-schedule.txt
arch/x86/kernel/cpu/mcheck/mce.c
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/feature-removal-schedule.txt | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index 503d21216d58..fa75220f8d34 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
| @@ -428,16 +428,6 @@ Who: Johannes Berg <johannes@sipsolutions.net> | |||
| 428 | 428 | ||
| 429 | ---------------------------- | 429 | ---------------------------- |
| 430 | 430 | ||
| 431 | What: CONFIG_X86_OLD_MCE | ||
| 432 | When: 2.6.32 | ||
| 433 | Why: Remove the old legacy 32bit machine check code. This has been | ||
| 434 | superseded by the newer machine check code from the 64bit port, | ||
| 435 | but the old version has been kept around for easier testing. Note this | ||
| 436 | doesn't impact the old P5 and WinChip machine check handlers. | ||
| 437 | Who: Andi Kleen <andi@firstfloor.org> | ||
| 438 | |||
| 439 | ---------------------------- | ||
| 440 | |||
| 441 | What: lock_policy_rwsem_* and unlock_policy_rwsem_* will not be | 431 | What: lock_policy_rwsem_* and unlock_policy_rwsem_* will not be |
| 442 | exported interface anymore. | 432 | exported interface anymore. |
| 443 | When: 2.6.33 | 433 | When: 2.6.33 |