diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-05 06:45:21 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-05 06:45:21 +0100 |
commit | 53c6de50262a8edd6932bb59a32db7b9d92f8d67 (patch) | |
tree | 3200068f880aa9647e9184f15619345727f447a5 /drivers/iio/adc/mcp3422.c | |
parent | Merge tag 'gpio-v3.13-3' of git://git.kernel.org/pub/scm/linux/kernel/git/lin... (diff) | |
parent | x86/apic, doc: Justification for disabling IO APIC before Local APIC (diff) | |
download | linux-53c6de50262a8edd6932bb59a32db7b9d92f8d67.tar.xz linux-53c6de50262a8edd6932bb59a32db7b9d92f8d67.zip |
Merge branch 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 and EFI fixes from Peter Anvin:
"Half of these are EFI-related:
The by far biggest change is the change to hold off the deletion of a
sysfs entry while a backend scan is in progress. This is to avoid
calling kmemdup() while under a spinlock.
The other major change is for each entry in the EFI pstore backend to
get a unique identifier, as required by the pstore filesystem proper.
The other changes are:
A fix to the recent consolidation and optimization of using "asm goto"
with read-modify-write operation, which broke the bitops; specifically
in such a way that we could end up generating invalid code.
A build hack to make sure we compile with -mno-sse. icc, and most
likely future versions of gcc, can generate SSE instructions unless we
tell it not to.
A comment-only patch to a change the was due in part to an unpublished
erratum; now when the erratum is published we want to add a comment
explaining why"
* 'x86/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/apic, doc: Justification for disabling IO APIC before Local APIC
x86, bitops: Correct the assembly constraints to testing bitops
x86-64, build: Always pass in -mno-sse
efi-pstore: Make efi-pstore return a unique id
x86/efi: Fix earlyprintk off-by-one bug
efivars, efi-pstore: Hold off deletion of sysfs entry until the scan is completed
Diffstat (limited to 'drivers/iio/adc/mcp3422.c')
0 files changed, 0 insertions, 0 deletions