Merge commit '5bc66170' into x86/urgent
From Borislav Petkov <bp@amd64.org>:
Below is a RAS fix which reverts the addition of a sysfs attribute
which we agreed is not needed, post-factum. And this should go in now
because that sysfs attribute is going to end up in 3.7 otherwise and
thus exposed to userspace; removing it then would be a lot harder.
This is done as a merge rather than a simple patch/cherry-pick since
the baseline for this patch was not in the previous x86/urgent.
Signed-off-by:
H. Peter Anvin <hpa@linux.intel.com>
Showing
- .gitignore 14 additions, 0 deletions.gitignore
- Documentation/00-INDEX 0 additions, 2 deletionsDocumentation/00-INDEX
- Documentation/ABI/obsolete/proc-pid-oom_adj 0 additions, 22 deletionsDocumentation/ABI/obsolete/proc-pid-oom_adj
- Documentation/ABI/testing/ima_policy 21 additions, 4 deletionsDocumentation/ABI/testing/ima_policy
- Documentation/ABI/testing/sysfs-block 14 additions, 0 deletionsDocumentation/ABI/testing/sysfs-block
- Documentation/ABI/testing/sysfs-bus-fcoe 6 additions, 6 deletionsDocumentation/ABI/testing/sysfs-bus-fcoe
- Documentation/ABI/testing/sysfs-bus-pci 12 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-pci
- Documentation/ABI/testing/sysfs-bus-rbd 12 additions, 6 deletionsDocumentation/ABI/testing/sysfs-bus-rbd
- Documentation/ABI/testing/sysfs-bus-usb 7 additions, 0 deletionsDocumentation/ABI/testing/sysfs-bus-usb
- Documentation/ABI/testing/sysfs-class-extcon 11 additions, 11 deletionsDocumentation/ABI/testing/sysfs-class-extcon
- Documentation/ABI/testing/sysfs-class-regulator 21 additions, 0 deletionsDocumentation/ABI/testing/sysfs-class-regulator
- Documentation/ABI/testing/sysfs-devices-firmware_node 17 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-firmware_node
- Documentation/ABI/testing/sysfs-devices-system-cpu 11 additions, 0 deletionsDocumentation/ABI/testing/sysfs-devices-system-cpu
- Documentation/ABI/testing/sysfs-driver-ppi 70 additions, 0 deletionsDocumentation/ABI/testing/sysfs-driver-ppi
- Documentation/ABI/testing/sysfs-driver-wacom 13 additions, 0 deletionsDocumentation/ABI/testing/sysfs-driver-wacom
- Documentation/ABI/testing/sysfs-fs-ext4 13 additions, 0 deletionsDocumentation/ABI/testing/sysfs-fs-ext4
- Documentation/ABI/testing/sysfs-ptp 5 additions, 1 deletionDocumentation/ABI/testing/sysfs-ptp
- Documentation/ABI/testing/sysfs-tty 9 additions, 0 deletionsDocumentation/ABI/testing/sysfs-tty
- Documentation/CodingStyle 10 additions, 0 deletionsDocumentation/CodingStyle
- Documentation/DocBook/drm.tmpl 2226 additions, 609 deletionsDocumentation/DocBook/drm.tmpl
Loading
Please register or sign in to comment