Linus Torvalds
ad6c2c2eb3
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
...
Pull EDAC fixes and ghes-edac from Mauro Carvalho Chehab:
"For:
- Some fixes at edac drivers (i7core_edac, sb_edac, i3200_edac);
- error injection support for i5100, when EDAC debug is enabled;
- fix edac when it is loaded builtin (early init for the subsystem);
- a "Firmware First" EDAC driver, allowing ghes to report errors via
EDAC (ghes-edac).
With regards to ghes-edac, this fixes a longstanding BZ at Red Hat
that happens with Nehalem and Sandy Bridge CPUs: when both GHES and
i7core_edac or sb_edac are running, the error reports are
unpredictable, as both BIOS and OS race to access the registers. With
ghes-edac, the EDAC core will refuse to register any other concurrent
memory error driver.
This patchset moves the ghes struct definitions to a separate header
file (include/acpi/ghes.h) and adds 3 hooks at apei/ghes.c to
register/unregister and to report errors via ghes-edac. Those changes
were acked by ghes driver maintainer (Huang)."
* 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac: (30 commits)
i5100_edac: convert to use simple_open()
ghes_edac: fix to use list_for_each_entry_safe() when delete list items
ghes_edac: Fix RAS tracing
ghes_edac: Make it compliant with UEFI spec 2.3.1
ghes_edac: Improve driver's printk messages
ghes_edac: Don't credit the same memory dimm twice
ghes_edac: do a better job of filling EDAC DIMM info
ghes_edac: add support for reporting errors via EDAC
ghes_edac: Register at EDAC core the BIOS report
ghes: add the needed hooks for EDAC error report
ghes: move structures/enum to a header file
edac: add support for error type "Info"
edac: add support for raw error reports
edac: reduce stack pressure by using a pre-allocated buffer
edac: lock module owner to avoid error report conflicts
edac: remove proc_name from mci structure
edac: add a new memory layer type
edac: initialize the core earlier
edac: better report error conditions in debug mode
i5100_edac: Remove two checkpatch warnings
...
2013-02-28 20:42:33 -08:00
..
accessibility
acpi
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2013-02-28 20:42:33 -08:00
amba
ata
1) apply, and then revert, the sysfs export of ATA host controller number.
2013-02-24 17:32:15 -08:00
atm
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
auxdisplay
base
CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap
2013-02-27 15:14:02 +05:30
bcma
block
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sage/ceph-client
2013-02-28 17:43:09 -08:00
bluetooth
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
bus
cdrom
char
drivers/char/misc.c:misc_register(): do not loop on misc_list unconditionally
2013-02-27 19:10:21 -08:00
clk
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
clocksource
arm-soc: mvebu platform changes
2013-02-28 20:09:24 -08:00
connector
net: proc: change proc_net_remove to remove_proc_entry
2013-02-18 14:53:08 -05:00
cpufreq
ACPI and power management fixes for 3.9-rc1
2013-02-25 21:25:17 -08:00
cpuidle
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
crypto
Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
2013-02-25 15:56:15 -08:00
dca
dca: convert to idr_alloc()
2013-02-27 19:10:15 -08:00
devfreq
dio
dma
dmaengine: convert to idr_alloc()
2013-02-27 19:10:15 -08:00
edac
Merge branch 'linux_next' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-edac
2013-02-28 20:42:33 -08:00
eisa
extcon
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
firewire
firewire: convert to idr_alloc()
2013-02-27 19:10:15 -08:00
firmware
Merge branch 'x86-efi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-27 16:17:42 -08:00
gpio
gpio: convert to idr_alloc()
2013-02-27 19:10:15 -08:00
gpu
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
hid
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
hsi
hv
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
hwmon
ACPI and power management updates for 3.9-rc1
2013-02-20 11:26:56 -08:00
hwspinlock
i2c
idr: remove MAX_IDR_MASK and move left MAX_IDR_* into idr.c
2013-02-27 19:10:20 -08:00
ide
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
idle
Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-02-22 19:25:09 -08:00
iio
Staging tree update for 3.9-rc1
2013-02-21 12:11:44 -08:00
infiniband
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
input
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
iommu
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
ipack
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
irqchip
arm-soc: cleanups
2013-02-21 14:58:40 -08:00
isdn
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
leds
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-02-26 09:29:02 -08:00
lguest
All trivial, thanks to the stuff which didn't quite make it time.
2013-02-26 14:49:12 -08:00
macintosh
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00
mailbox
md
Merge branch 'for-3.9/core' of git://git.kernel.dk/linux-block
2013-02-28 12:52:24 -08:00
media
arm-soc: late OMAP changes
2013-02-28 20:00:40 -08:00
memory
memstick
memstick: move the dereference below the NULL test
2013-02-27 19:10:23 -08:00
message
mfd
mfd: convert to idr_alloc()
2013-02-27 19:10:17 -08:00
misc
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
mmc
mmc: convert to idr_alloc()
2013-02-27 19:10:17 -08:00
mtd
mtd: mtd_stresstest: use prandom_bytes()
2013-02-27 19:10:23 -08:00
net
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
nfc
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2013-02-18 13:47:13 -05:00
ntb
nubus
of
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
oprofile
oprofilefs: add missing ->i_mutex locking in object creation
2013-02-22 23:31:38 -05:00
parisc
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
parport
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
2013-02-21 17:54:03 -08:00
pci
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
pcmcia
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-02-21 17:40:58 -08:00
pinctrl
arm-soc: device tree conversions
2013-02-21 15:38:49 -08:00
platform
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
pnp
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
power
power: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
pps
drivers/pps/clients/pps-gpio.c: use devm_kzalloc
2013-02-27 19:10:23 -08:00
ps3
ptp
pwm
pwm: Changes for v3.9-rc1
2013-02-26 09:34:29 -08:00
rapidio
regulator
Merge remote-tracking branch 'regulator/topic/tps65090' into regulator-next
2013-02-19 12:43:12 +00:00
remoteproc
remoteproc: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
rpmsg
rpmsg: convert to idr_alloc()
2013-02-27 19:10:18 -08:00
rtc
This is the MFD pull request for the 3.9 merge window.
2013-02-24 20:00:58 -08:00
s390
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
sbus
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
scsi
SCSI misc on 20130222
2013-02-28 12:43:43 -08:00
sfi
sh
sn
spi
arm-soc: soc-specific updates
2013-02-21 15:27:22 -08:00
ssb
staging
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
target
hlist: drop the node parameter from iterators
2013-02-27 19:10:24 -08:00
tc
thermal
Fix mis-merge of intel_powerclamp.c resulting in compile error
2013-02-28 20:23:09 -08:00
tty
sysrq: don't depend on weak undefined arrays to have an address that compares as NULL
2013-02-27 09:59:50 -08:00
uio
uio: convert to idr_alloc()
2013-02-27 19:10:19 -08:00
usb
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
uwb
vfio
vfio: convert to idr_alloc()
2013-02-27 19:10:19 -08:00
vhost
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-02-26 11:42:23 -08:00
video
backlight: add new lp8788 backlight driver
2013-02-27 19:10:09 -08:00
virt
virtio
All trivial, thanks to the stuff which didn't quite make it time.
2013-02-26 14:49:12 -08:00
vlynq
vme
w1
arm-soc: i.MX DT changes
2013-02-28 19:59:34 -08:00
watchdog
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
xen
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-02-26 20:16:07 -08:00
zorro
new helper: file_inode(file)
2013-02-22 23:31:31 -05:00
Kconfig
Char/Misc driver patches for 3.9-rc1
2013-02-21 13:57:13 -08:00
Makefile
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2013-02-23 17:09:55 -08:00