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

Commit 0d36938b authored by David S. Miller's avatar David S. Miller
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

parents 55f14da6 4941b8f0

.get_maintainer.ignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
Christoph Hellwig <hch@lst.de>

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5850,6 +5850,7 @@ S: Odd Fixes 


KERNEL NFSD, SUNRPC, AND LOCKD SERVERS

M:	"J. Bruce Fields" <bfields@fieldses.org>

M:	Jeff Layton <jlayton@poochiereds.net>

L:	linux-nfs@vger.kernel.org

W:	http://nfs.sourceforge.net/

S:	Supported

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 4

PATCHLEVEL = 2

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/arm/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -312,6 +312,9 @@ INSTALL_TARGETS = zinstall uinstall install 


PHONY += bzImage $(BOOT_TARGETS) $(INSTALL_TARGETS)



bootpImage uImage: zImage

zImage: Image



$(BOOT_TARGETS): vmlinux

	$(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/$@

arch/arm/lib/uaccess_with_memcpy.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ __copy_to_user_memcpy(void __user *to, const void *from, unsigned long n) 
	}



	/* the mmap semaphore is taken only if not in an atomic context */

	atomic = in_atomic();

	atomic = faulthandler_disabled();



	if (!atomic)

		down_read(&current->mm->mmap_sem);