diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-07 19:16:23 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-11-07 19:16:23 +0100 |
commit | b58ec8b5824717875b844a9e8cc62fc6eb5fd289 (patch) | |
tree | 96c4d09b560049490008eb1edbb05662e9d83b6c /drivers/net/usb/kalmia.c | |
parent | Merge tag 'openrisc-for-linus-v4.9-rc5' of git://git.kernel.org/pub/scm/linux... (diff) | |
parent | arm64: Fix circular include of asm/lse.h through linux/jump_label.h (diff) | |
download | linux-b58ec8b5824717875b844a9e8cc62fc6eb5fd289.tar.xz linux-b58ec8b5824717875b844a9e8cc62fc6eb5fd289.zip |
Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux
Pull arm64 fix from Will Deacon:
"It's been pretty quiet on the fixes side of things for us, but Artem
reported a build failure introduced during the merge window that
appears with older GCCs that do not support asm goto. The fix is
bigger than I'd like, but it's a mechnical move of some constants to
break an include dependency between atomic.h and jump_label.h when
!HAVE_JUMP_LABEL.
Summary:
- Fix build failure on compilers without asm goto"
* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
arm64: Fix circular include of asm/lse.h through linux/jump_label.h
Diffstat (limited to 'drivers/net/usb/kalmia.c')
0 files changed, 0 insertions, 0 deletions