1
0
Fork 0
alistair23-linux/drivers
Linus Torvalds b20c99eb66 Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 RAS changes from Ingo Molnar:
 "[ The reason for drivers/ updates is that Boris asked for the
    drivers/edac/ changes to go via x86/ras in this cycle ]

  Main changes:

   - AMD CPUs:
      . Add ECC event decoding support for new F15h models
      . Various erratum fixes
      . Fix single-channel on dual-channel-controllers bug.

   - Intel CPUs:
      . UC uncorrectable memory error parsing fix
      . Add support for CMC (Corrected Machine Check) 'FF' (Firmware
        First) flag in the APEI HEST

   - Various cleanups and fixes"

* 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  amd64_edac: Fix incorrect wraparounds
  amd64_edac: Correct erratum 505 range
  cpc925_edac: Use proper array termination
  x86/mce, acpi/apei: Only disable banks listed in HEST if mce is configured
  amd64_edac: Get rid of boot_cpu_data accesses
  amd64_edac: Add ECC decoding support for newer F15h models
  x86, amd_nb: Clarify F15h, model 30h GART and L3 support
  pci_ids: Add PCI device ID functions 3 and 4 for newer F15h models.
  x38_edac: Make a local function static
  i3200_edac: Make a local function static
  x86/mce: Pay no attention to 'F' bit in MCACOD when parsing 'UC' errors
  APEI/ERST: Fix error message formatting
  amd64_edac: Fix single-channel setups
  EDAC: Replace strict_strtol() with kstrtol()
  mce: acpi/apei: Soft-offline a page on firmware GHES notification
  mce: acpi/apei: Add a boot option to disable ff mode for corrected errors
  mce: acpi/apei: Honour Firmware First for MCA banks listed in APEI HEST CMC
2013-09-04 11:07:04 -07:00
..
accessibility
acpi Merge branch 'x86-ras-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2013-09-04 11:07:04 -07:00
amba
ata Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 2013-09-03 18:19:53 -07:00
atm
auxdisplay
base ACPI and power management updates for 3.12-rc1 2013-09-03 15:59:39 -07:00
bcma
block Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
bluetooth
bus drivers/bus: arm-cci: avoid parsing DT for cpu device nodes 2013-08-21 10:29:53 +01:00
cdrom
char ACPI and power management updates for 3.12-rc1 2013-09-03 15:59:39 -07:00
clk clk: exynos4: Add CLK_GET_RATE_NOCACHE flag for the Exynos4x12 ISP clocks 2013-08-13 10:01:56 -07:00
clocksource Merge branch 'timers/clockevents-next' of git://git.linaro.org/people/dlezcano/clockevents into timers/core 2013-08-21 14:59:23 +02:00
connector
cpufreq ACPI and power management updates for 3.12-rc1 2013-09-03 15:59:39 -07:00
cpuidle cpuidle: coupled: fix race condition between pokes and safe state 2013-08-29 22:15:34 +02:00
crypto
dca
devfreq devfreq: convert devfreq_class to use dev_groups 2013-08-19 21:22:34 -07:00
dio
dma Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
edac amd64_edac: Fix incorrect wraparounds 2013-08-27 15:00:22 +02:00
eisa
extcon Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
firewire
firmware Big part of this is the addition of compression to the 2013-09-03 21:14:06 -07:00
fmc FMC: Staticize local symbols 2013-08-12 15:45:40 -07:00
gpio
gpu drm/vmwgfx: Split GMR2_REMAP commands if they are to large 2013-08-30 09:03:39 +10:00
hid Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
hsi
hv Drivers: hv: vmbus: Do not attempt to negoatiate a new version prematurely 2013-08-30 12:08:04 -07:00
hwmon New driver for HTU21D (humidity sensor) 2013-09-03 10:43:35 -07:00
hwspinlock
i2c i2c: Fix Kontron PLD prescaler calculation 2013-08-05 10:31:18 +02:00
ide
idle
iio staging tree merge for 3.12-rc1 2013-09-03 11:37:57 -07:00
infiniband [SCSI] IB/iser: Add Discovery support 2013-08-26 18:53:49 +04:00
input Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
iommu
ipack
irqchip irqchip: sirf: move from legacy mode to linear irqdomain 2013-08-29 09:48:32 -07:00
isdn Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
leds
lguest
macintosh powerpc/windfarm: Fix noisy slots-fan on Xserve (rm31) 2013-08-01 13:11:47 +10:00
mailbox
md SCSI misc on 20130903 2013-09-03 15:48:06 -07:00
media Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
memory
memstick
message
mfd PCI changes for the v3.12 merge window: 2013-09-03 16:24:35 -07:00
misc Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
mmc
mtd
net PCI changes for the v3.12 merge window: 2013-09-03 16:24:35 -07:00
nfc
ntb
nubus
of ACPI and power management updates for 3.12-rc1 2013-09-03 15:59:39 -07:00
oprofile
parisc PCI changes for the v3.12 merge window: 2013-09-03 16:24:35 -07:00
parport drivers: parport: Kconfig: exclude h8300 for PARPORT_PC 2013-08-30 12:08:04 -07:00
pci PCI changes for the v3.12 merge window: 2013-09-03 16:24:35 -07:00
pcmcia
pinctrl pinctrl: sunxi: Add spinlocks 2013-08-07 21:57:17 +02:00
platform ACPI and power management updates for 3.12-rc1 2013-09-03 15:59:39 -07:00
pnp Merge branch 'pnp' 2013-08-27 01:41:35 +02:00
power
pps PPS: convert class code to use dev_groups 2013-08-19 21:22:34 -07:00
ps3
ptp
pwm pwm: pxa: Use module_platform_driver 2013-09-03 13:09:17 +02:00
rapidio
regulator Merge remote-tracking branch 'regulator/topic/tps65912' into regulator-next 2013-09-01 13:50:23 +01:00
remoteproc
reset
rpmsg
rtc Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
s390 SCSI misc on 20130903 2013-09-03 15:48:06 -07:00
sbus
scsi Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata 2013-09-03 18:19:53 -07:00
sfi
sh
sn
spi Merge remote-tracking branch 'spi/topic/txx9' into spi-next 2013-09-01 13:49:18 +01:00
ssb
staging TTY/Serial driver patches for 3.12-rc1 2013-09-03 11:38:36 -07:00
target target: Fix se_cmd->state_list leak regression during WRITE failure 2013-08-31 15:19:12 -07:00
tc
thermal
tty TTY/Serial driver patches for 3.12-rc1 2013-09-03 11:38:36 -07:00
uio Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
usb Driver core patches for 3.12-rc1 2013-09-03 11:37:15 -07:00
uwb uwb: Staticize local symbols 2013-08-19 17:08:16 -07:00
vfio
vhost
video Merge branch 'x86-fb-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2013-09-04 09:12:17 -07:00
virt
virtio
vlynq
vme vme: vme_ca91cx42.c: fix to pass correct device identity to free_irq() 2013-08-27 21:49:26 -07:00
w1 w1: slaves: w1_ds2781: convert to use w1_family_ops.groups 2013-08-22 11:05:44 -07:00
watchdog
xen Merge branch 'acpi-sleep' 2013-08-27 01:28:38 +02:00
zorro
Kconfig
Makefile