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

Commit f74290fd authored Feb 24, 2018 by David S. Miller

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

parents 1b71af60 9cb9c07d

.gitignore

+4 −0

Original line number	Diff line number	Diff line
		@@ -127,3 +127,7 @@ all.config

		# Kdevelop4
		*.kdev4

		#Automatically generated by ASN.1 compiler
		net/ipv4/netfilter/nf_nat_snmp_basic-asn1.c
		net/ipv4/netfilter/nf_nat_snmp_basic-asn1.h

Documentation/gpu/tve200.rst

+1 −1

Original line number	Diff line number	Diff line
		@@ -3,4 +3,4 @@
		==================================

		.. kernel-doc:: drivers/gpu/drm/tve200/tve200_drv.c
		:doc: Faraday TV Encoder 200
		:doc: Faraday TV Encoder TVE200 DRM Driver

Documentation/i2c/busses/i2c-i801

+2 −0

Original line number	Diff line number	Diff line
		@@ -28,8 +28,10 @@ Supported adapters:
		* Intel Wildcat Point (PCH)
		* Intel Wildcat Point-LP (PCH)
		* Intel BayTrail (SOC)
		* Intel Braswell (SOC)
		* Intel Sunrise Point-H (PCH)
		* Intel Sunrise Point-LP (PCH)
		* Intel Kaby Lake-H (PCH)
		* Intel DNV (SOC)
		* Intel Broxton (SOC)
		* Intel Lewisburg (PCH)

MAINTAINERS

+0 −1

Original line number	Diff line number	Diff line
		@@ -7909,7 +7909,6 @@ S: Maintained
		F: scripts/leaking_addresses.pl

		LED SUBSYSTEM
		M: Richard Purdie <rpurdie@rpsys.net>
		M: Jacek Anaszewski <jacek.anaszewski@gmail.com>
		M: Pavel Machek <pavel@ucw.cz>
		L: linux-leds@vger.kernel.org

arch/arc/include/asm/bug.h

+2 −1

Original line number	Diff line number	Diff line
		@@ -23,7 +23,8 @@ void die(const char str, struct pt_regs regs, unsigned long address);

		#define BUG() do { \
		pr_warn("BUG: failure at %s:%d/%s()!\n", __FILE__, __LINE__, __func__); \
		dump_stack(); \
		barrier_before_unreachable(); \
		__builtin_trap(); \
		} while (0)

		#define HAVE_ARCH_BUG