Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'misc-for-linus-4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull misc fixes from Guenter Roeck:
"There are two patches here. One fixes a build error affecting the
blackfin architecture, the other fixes a build error affecting the
score architecture.

The score maintainer (Lennox Wu) has a hard time sending you the score
patch, and the blackfin maintainer (Steven Miao) has been silent since
-rc1. Since 4.1 is about to be released, I figured it would be useful
to get the patches upstream to avoid the related build failures in the
final release"

* tag 'misc-for-linus-4.1-rc8' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
score: Fix exception handler label
blackfin: Fix build error

+2 -1
+1
arch/blackfin/include/asm/io.h
··· 10 10 #include <linux/compiler.h> 11 11 #include <linux/types.h> 12 12 #include <asm/byteorder.h> 13 + #include <asm/def_LPBlackfin.h> 13 14 14 15 #define __raw_readb bfin_read8 15 16 #define __raw_readw bfin_read16
+1 -1
arch/score/lib/string.S
··· 175 175 br r3 176 176 177 177 .section .fixup, "ax" 178 + 99: 178 179 br r3 179 180 .previous 180 181 .section __ex_table, "a" 181 182 .align 2 182 - 99: 183 183 .word 0b, 99b 184 184 .previous