Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b5c42bc8 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents b14f3bd9 add8a505

MAINTAINERS

+9 −9
Original line number Diff line number Diff line
@@ -1132,17 +1132,17 @@ F: fs/bfs/ 
F:	include/linux/bfs_fs.h



BLACKFIN ARCHITECTURE

P:	Bryan Wu

M:	cooloney@kernel.org

P:	Mike Frysinger

M:	vapier@gentoo.org

L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org

S:	Supported

F:	arch/blackfin/



BLACKFIN EMAC DRIVER

P:	Bryan Wu

M:	cooloney@kernel.org

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

P:	Michael Hennerich

M:	michael.hennerich@analog.com

L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org

S:	Supported

F:	drivers/net/bfin_mac.*
@@ -1150,7 +1150,7 @@ F: drivers/net/bfin_mac.* 
BLACKFIN RTC DRIVER

P:	Mike Frysinger

M:	vapier.adi@gmail.com

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org

S:	Supported

F:	drivers/rtc/rtc-bfin.c
@@ -1158,7 +1158,7 @@ F: drivers/rtc/rtc-bfin.c 
BLACKFIN SERIAL DRIVER

P:	Sonic Zhang

M:	sonic.zhang@analog.com

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org

S:	Supported

F:	drivers/serial/bfin_5xx.c
@@ -1166,7 +1166,7 @@ F: drivers/serial/bfin_5xx.c 
BLACKFIN WATCHDOG DRIVER

P:	Mike Frysinger

M:	vapier.adi@gmail.com

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org

S:	Supported

F:	drivers/watchdog/bfin_wdt.c
@@ -1174,7 +1174,7 @@ F: drivers/watchdog/bfin_wdt.c 
BLACKFIN I2C TWI DRIVER

P:	Sonic Zhang

M:	sonic.zhang@analog.com

L:	uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)

L:	uclinux-dist-devel@blackfin.uclinux.org

W:	http://blackfin.uclinux.org/

S:	Supported

F:	drivers/i2c/busses/i2c-bfin-twi.c

arch/blackfin/include/asm/.gitignore

deleted100644 → 0
+0 −1
Original line number Diff line number Diff line 
+mach

arch/blackfin/include/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -378,8 +378,10 @@ 
#define __NR_dup3		363

#define __NR_pipe2		364

#define __NR_inotify_init1	365

#define __NR_preadv		366

#define __NR_pwritev		367



#define __NR_syscall		366

#define __NR_syscall		368

#define NR_syscalls		__NR_syscall



/* Old optional stuff no one actually uses */

arch/blackfin/kernel/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
vmlinux.lds

arch/blackfin/lib/strncmp.c

+1 −2
Original line number Diff line number Diff line
@@ -8,9 +8,8 @@ 


#define strncmp __inline_strncmp

#include <asm/string.h>

#undef strncmp



#include <linux/module.h>

#undef strncmp



int strncmp(const char *cs, const char *ct, size_t count)

{