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

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

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



Conflicts:
	net/netfilter/nf_tables_core.c

The nf_tables_core.c conflict was resolved using a conflict resolution
from Stephen Rothwell as a guide.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ba7c95ea 90a5a895

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -10206,6 +10206,13 @@ S: Maintained 
F:	Documentation/usb/ohci.txt

F:	drivers/usb/host/ohci*



USB OTG FSM (Finite State Machine)

M:	Peter Chen <Peter.Chen@freescale.com>

T:	git git://github.com/hzpeterchen/linux-usb.git

L:	linux-usb@vger.kernel.org

S:	Maintained

F:	drivers/usb/common/usb-otg-fsm.c



USB OVER IP DRIVER

M:	Valentina Manea <valentina.manea.m@gmail.com>

M:	Shuah Khan <shuah.kh@samsung.com>

Makefile

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

PATCHLEVEL = 0

SUBLEVEL = 0

EXTRAVERSION = -rc4

EXTRAVERSION = -rc5

NAME = Hurr durr I'ma sheep



# *DOCUMENTATION*

arch/arm/kernel/setup.c

+1 −4
Original line number Diff line number Diff line
@@ -246,12 +246,9 @@ static int __get_cpu_architecture(void) 
		if (cpu_arch)

			cpu_arch += CPU_ARCH_ARMv3;

	} else if ((read_cpuid_id() & 0x000f0000) == 0x000f0000) {

		unsigned int mmfr0;



		/* Revised CPUID format. Read the Memory Model Feature

		 * Register 0 and check for VMSAv7 or PMSAv7 */

		asm("mrc	p15, 0, %0, c0, c1, 4"

		    : "=r" (mmfr0));

		unsigned int mmfr0 = read_cpuid_ext(CPUID_EXT_MMFR0);

		if ((mmfr0 & 0x0000000f) >= 0x00000003 ||

		    (mmfr0 & 0x000000f0) >= 0x00000030)

			cpu_arch = CPU_ARCH_ARMv7;

arch/arm/mm/cache-l2x0.c

+16 −17
Original line number Diff line number Diff line
@@ -1131,9 +1131,7 @@ static void __init l2c310_of_parse(const struct device_node *np, 
	}



	ret = l2x0_cache_size_of_parse(np, aux_val, aux_mask, &assoc, SZ_512K);

	if (ret)

		return;



	if (!ret) {

		switch (assoc) {

		case 16:

			*aux_val &= ~L2X0_AUX_CTRL_ASSOC_MASK;
@@ -1149,6 +1147,7 @@ static void __init l2c310_of_parse(const struct device_node *np, 
			       assoc);

			break;

		}

	}



	prefetch = l2x0_saved_regs.prefetch_ctrl;

arch/arm/mm/dma-mapping.c

+1 −1
Original line number Diff line number Diff line
@@ -171,7 +171,7 @@ static int __dma_supported(struct device *dev, u64 mask, bool warn) 
	 */

	if (sizeof(mask) != sizeof(dma_addr_t) &&

	    mask > (dma_addr_t)~0 &&

	    dma_to_pfn(dev, ~0) < max_pfn) {

	    dma_to_pfn(dev, ~0) < max_pfn - 1) {

		if (warn) {

			dev_warn(dev, "Coherent DMA mask %#llx is larger than dma_addr_t allows\n",

				 mask);