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

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

Lots of overlapping changes, mostly trivial in nature.

The mlxsw conflict was resolving using the example
resolution at:

https://github.com/jpirko/linux_mlxsw/blob/combined_queue/drivers/net/ethernet/mellanox/mlxsw/core_acl_flex_actions.c



Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d89d4155 1ffaddd0

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5444,6 +5444,7 @@ F: drivers/iommu/exynos-iommu.c 


EZchip NPS platform support

M:	Vineet Gupta <vgupta@synopsys.com>

M:	Ofer Levi <oferle@mellanox.com>

S:	Supported

F:	arch/arc/plat-eznps

F:	arch/arc/boot/dts/eznps.dts

Makefile

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
VERSION = 4

PATCHLEVEL = 18

SUBLEVEL = 0

EXTRAVERSION = -rc7

EXTRAVERSION = -rc8

NAME = Merciless Moray



# *DOCUMENTATION*

arch/arc/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -50,6 +50,9 @@ config ARC 
	select HAVE_KERNEL_LZMA

	select ARCH_HAS_PTE_SPECIAL



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y



config MIGHT_HAVE_PCI

	bool

arch/arc/include/asm/cache.h

+3 −1
Original line number Diff line number Diff line
@@ -48,7 +48,9 @@ 
})



/* Largest line length for either L1 or L2 is 128 bytes */

#define ARCH_DMA_MINALIGN      128

#define SMP_CACHE_BYTES		128

#define cache_line_size()	SMP_CACHE_BYTES

#define ARCH_DMA_MINALIGN	SMP_CACHE_BYTES



extern void arc_cache_init(void);

extern char *arc_cache_mumbojumbo(int cpu_id, char *buf, int len);

arch/arc/include/asm/delay.h

+3 −0
Original line number Diff line number Diff line
@@ -17,8 +17,11 @@ 
#ifndef __ASM_ARC_UDELAY_H

#define __ASM_ARC_UDELAY_H



#include <asm-generic/types.h>

#include <asm/param.h>		/* HZ */



extern unsigned long loops_per_jiffy;



static inline void __delay(unsigned long loops)

{

	__asm__ __volatile__(