Commit b5c42bc8db17db80917f99205a03c51f17354495
Exists in
master
and in
20 other branches
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vapier/blackfin: Blackfin: fix strncmp.o build error Blackfin: drop unneeded asm/.gitignore Blackfin: ignore generated vmlinux.lds MAINTAINERS: drop (subscribers-only) markings on Blackfin lists MAINTAINERS: update Blackfin items Blackfin: hook up preadv/pwritev syscalls
Showing 6 changed files Side-by-side Diff
MAINTAINERS
| ... | ... | @@ -1132,17 +1132,17 @@ |
| 1132 | 1132 | F: include/linux/bfs_fs.h |
| 1133 | 1133 | |
| 1134 | 1134 | BLACKFIN ARCHITECTURE |
| 1135 | -P: Bryan Wu | |
| 1136 | -M: cooloney@kernel.org | |
| 1135 | +P: Mike Frysinger | |
| 1136 | +M: vapier@gentoo.org | |
| 1137 | 1137 | L: uclinux-dist-devel@blackfin.uclinux.org |
| 1138 | 1138 | W: http://blackfin.uclinux.org |
| 1139 | 1139 | S: Supported |
| 1140 | 1140 | F: arch/blackfin/ |
| 1141 | 1141 | |
| 1142 | 1142 | BLACKFIN EMAC DRIVER |
| 1143 | -P: Bryan Wu | |
| 1144 | -M: cooloney@kernel.org | |
| 1145 | -L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) | |
| 1143 | +P: Michael Hennerich | |
| 1144 | +M: michael.hennerich@analog.com | |
| 1145 | +L: uclinux-dist-devel@blackfin.uclinux.org | |
| 1146 | 1146 | W: http://blackfin.uclinux.org |
| 1147 | 1147 | S: Supported |
| 1148 | 1148 | F: drivers/net/bfin_mac.* |
| ... | ... | @@ -1150,7 +1150,7 @@ |
| 1150 | 1150 | BLACKFIN RTC DRIVER |
| 1151 | 1151 | P: Mike Frysinger |
| 1152 | 1152 | M: vapier.adi@gmail.com |
| 1153 | -L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) | |
| 1153 | +L: uclinux-dist-devel@blackfin.uclinux.org | |
| 1154 | 1154 | W: http://blackfin.uclinux.org |
| 1155 | 1155 | S: Supported |
| 1156 | 1156 | F: drivers/rtc/rtc-bfin.c |
| ... | ... | @@ -1158,7 +1158,7 @@ |
| 1158 | 1158 | BLACKFIN SERIAL DRIVER |
| 1159 | 1159 | P: Sonic Zhang |
| 1160 | 1160 | M: sonic.zhang@analog.com |
| 1161 | -L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) | |
| 1161 | +L: uclinux-dist-devel@blackfin.uclinux.org | |
| 1162 | 1162 | W: http://blackfin.uclinux.org |
| 1163 | 1163 | S: Supported |
| 1164 | 1164 | F: drivers/serial/bfin_5xx.c |
| ... | ... | @@ -1166,7 +1166,7 @@ |
| 1166 | 1166 | BLACKFIN WATCHDOG DRIVER |
| 1167 | 1167 | P: Mike Frysinger |
| 1168 | 1168 | M: vapier.adi@gmail.com |
| 1169 | -L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) | |
| 1169 | +L: uclinux-dist-devel@blackfin.uclinux.org | |
| 1170 | 1170 | W: http://blackfin.uclinux.org |
| 1171 | 1171 | S: Supported |
| 1172 | 1172 | F: drivers/watchdog/bfin_wdt.c |
| ... | ... | @@ -1174,7 +1174,7 @@ |
| 1174 | 1174 | BLACKFIN I2C TWI DRIVER |
| 1175 | 1175 | P: Sonic Zhang |
| 1176 | 1176 | M: sonic.zhang@analog.com |
| 1177 | -L: uclinux-dist-devel@blackfin.uclinux.org (subscribers-only) | |
| 1177 | +L: uclinux-dist-devel@blackfin.uclinux.org | |
| 1178 | 1178 | W: http://blackfin.uclinux.org/ |
| 1179 | 1179 | S: Supported |
| 1180 | 1180 | F: drivers/i2c/busses/i2c-bfin-twi.c |
arch/blackfin/include/asm/.gitignore
| 1 | -+mach |
arch/blackfin/include/asm/unistd.h
| ... | ... | @@ -378,8 +378,10 @@ |
| 378 | 378 | #define __NR_dup3 363 |
| 379 | 379 | #define __NR_pipe2 364 |
| 380 | 380 | #define __NR_inotify_init1 365 |
| 381 | +#define __NR_preadv 366 | |
| 382 | +#define __NR_pwritev 367 | |
| 381 | 383 | |
| 382 | -#define __NR_syscall 366 | |
| 384 | +#define __NR_syscall 368 | |
| 383 | 385 | #define NR_syscalls __NR_syscall |
| 384 | 386 | |
| 385 | 387 | /* Old optional stuff no one actually uses */ |
arch/blackfin/kernel/.gitignore
| 1 | +vmlinux.lds |
arch/blackfin/lib/strncmp.c
arch/blackfin/mach-common/entry.S