diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-30 14:54:24 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-08-30 14:54:24 -0700 |
| commit | dd689a68bc3551ad7bdff2c881fede5f0bd12cfa (patch) | |
| tree | a24dc60a677c9815ca5daf3a4ec0a74715e31e97 /block/blk-mq-debugfs.h | |
| parent | 36fde05f3fb51edea879636db590d70e11f16c82 (diff) | |
| parent | cec80d82142ab25c71eee24b529cfeaf17c43062 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha
Pull alpha update from Matt Turner:
"A few fixes and wires up some additional syscalls."
[ Some of this is technically not really rc7 material, but it's alpha,
and it all looks safe anyway. Matt explains: "My alpha has been
offline, hence the very late-in-cycle pull request" and hasn't caused
problems before, so he gets to slide. - Linus ]
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha:
alpha: uapi: Add support for __SANE_USERSPACE_TYPES__
alpha: Define ioremap_wc
alpha: Fix section mismatches
alpha: support R_ALPHA_REFLONG relocations for module loading
alpha: Fix typo in ev6-copy_user.S
alpha: Package string routines together
alpha: Update for new syscalls
alpha: Fix build error without CONFIG_VGA_HOSE.
Diffstat (limited to 'block/blk-mq-debugfs.h')
0 files changed, 0 insertions, 0 deletions