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

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

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



udplite conflict is resolved by taking what 'net-next' did
which removed the backlog receive method assignment, since
it is no longer necessary.

Two entries were added to the non-priv ethtool operations
switch statement, one in 'net' and one in 'net-next, so
simple overlapping changes.

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e5f12b3f d8e435f3

MAINTAINERS

+10 −0
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ Descriptions of section entries: 
	Q: Patchwork web based patch tracking system site

	T: SCM tree type and location.

	   Type is one of: git, hg, quilt, stgit, topgit

	B: Bug tracking system location.

	S: Status, one of the following:

	   Supported:	Someone is actually paid to look after this.

	   Maintained:	Someone actually looks after it.
@@ -281,6 +282,7 @@ L: linux-acpi@vger.kernel.org 
W:	https://01.org/linux-acpi

Q:	https://patchwork.kernel.org/project/linux-acpi/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

B:	https://bugzilla.kernel.org

S:	Supported

F:	drivers/acpi/

F:	drivers/pnp/pnpacpi/
@@ -304,6 +306,8 @@ W: https://acpica.org/ 
W:	https://github.com/acpica/acpica/

Q:	https://patchwork.kernel.org/project/linux-acpi/list/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

B:	https://bugzilla.kernel.org

B:	https://bugs.acpica.org

S:	Supported

F:	drivers/acpi/acpica/

F:	include/acpi/
@@ -313,6 +317,7 @@ ACPI FAN DRIVER 
M:	Zhang Rui <rui.zhang@intel.com>

L:	linux-acpi@vger.kernel.org

W:	https://01.org/linux-acpi

B:	https://bugzilla.kernel.org

S:	Supported

F:	drivers/acpi/fan.c
@@ -328,6 +333,7 @@ ACPI THERMAL DRIVER 
M:	Zhang Rui <rui.zhang@intel.com>

L:	linux-acpi@vger.kernel.org

W:	https://01.org/linux-acpi

B:	https://bugzilla.kernel.org

S:	Supported

F:	drivers/acpi/*thermal*
@@ -335,6 +341,7 @@ ACPI VIDEO DRIVER 
M:	Zhang Rui <rui.zhang@intel.com>

L:	linux-acpi@vger.kernel.org

W:	https://01.org/linux-acpi

B:	https://bugzilla.kernel.org

S:	Supported

F:	drivers/acpi/acpi_video.c
@@ -5665,6 +5672,7 @@ HIBERNATION (aka Software Suspend, aka swsusp) 
M:	"Rafael J. Wysocki" <rjw@rjwysocki.net>

M:	Pavel Machek <pavel@ucw.cz>

L:	linux-pm@vger.kernel.org

B:	https://bugzilla.kernel.org

S:	Supported

F:	arch/x86/power/

F:	drivers/base/power/
@@ -9625,6 +9633,7 @@ POWER MANAGEMENT CORE 
M:	"Rafael J. Wysocki" <rjw@rjwysocki.net>

L:	linux-pm@vger.kernel.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm

B:	https://bugzilla.kernel.org

S:	Supported

F:	drivers/base/power/

F:	include/linux/pm.h
@@ -11614,6 +11623,7 @@ M: "Rafael J. Wysocki" <rjw@rjwysocki.net> 
M:	Len Brown <len.brown@intel.com>

M:	Pavel Machek <pavel@ucw.cz>

L:	linux-pm@vger.kernel.org

B:	https://bugzilla.kernel.org

S:	Supported

F:	Documentation/power/

F:	arch/x86/kernel/acpi/

arch/arm/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ generic-y += early_ioremap.h 
generic-y += emergency-restart.h

generic-y += errno.h

generic-y += exec.h

generic-y += export.h

generic-y += ioctl.h

generic-y += ipcbuf.h

generic-y += irq_regs.h

arch/arm/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ endif 
obj-$(CONFIG_CPU_IDLE)		+= cpuidle.o

obj-$(CONFIG_ISA_DMA_API)	+= dma.o

obj-$(CONFIG_FIQ)		+= fiq.o fiqasm.o

obj-$(CONFIG_MODULES)		+= module.o

obj-$(CONFIG_MODULES)		+= armksyms.o module.o

obj-$(CONFIG_ARM_MODULE_PLTS)	+= module-plts.o

obj-$(CONFIG_ISA_DMA)		+= dma-isa.o

obj-$(CONFIG_PCI)		+= bios32.o isa.o

arch/arm/kernel/armksyms.c

0 → 100644
+183 −0
Original line number Diff line number Diff line 
/*

 *  linux/arch/arm/kernel/armksyms.c

 *

 *  Copyright (C) 2000 Russell King

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */

#include <linux/export.h>

#include <linux/sched.h>

#include <linux/string.h>

#include <linux/cryptohash.h>

#include <linux/delay.h>

#include <linux/in6.h>

#include <linux/syscalls.h>

#include <linux/uaccess.h>

#include <linux/io.h>

#include <linux/arm-smccc.h>



#include <asm/checksum.h>

#include <asm/ftrace.h>



/*

 * libgcc functions - functions that are used internally by the

 * compiler...  (prototypes are not correct though, but that

 * doesn't really matter since they're not versioned).

 */

extern void __ashldi3(void);

extern void __ashrdi3(void);

extern void __divsi3(void);

extern void __lshrdi3(void);

extern void __modsi3(void);

extern void __muldi3(void);

extern void __ucmpdi2(void);

extern void __udivsi3(void);

extern void __umodsi3(void);

extern void __do_div64(void);

extern void __bswapsi2(void);

extern void __bswapdi2(void);



extern void __aeabi_idiv(void);

extern void __aeabi_idivmod(void);

extern void __aeabi_lasr(void);

extern void __aeabi_llsl(void);

extern void __aeabi_llsr(void);

extern void __aeabi_lmul(void);

extern void __aeabi_uidiv(void);

extern void __aeabi_uidivmod(void);

extern void __aeabi_ulcmp(void);



extern void fpundefinstr(void);



void mmioset(void *, unsigned int, size_t);

void mmiocpy(void *, const void *, size_t);



	/* platform dependent support */

EXPORT_SYMBOL(arm_delay_ops);



	/* networking */

EXPORT_SYMBOL(csum_partial);

EXPORT_SYMBOL(csum_partial_copy_from_user);

EXPORT_SYMBOL(csum_partial_copy_nocheck);

EXPORT_SYMBOL(__csum_ipv6_magic);



	/* io */

#ifndef __raw_readsb

EXPORT_SYMBOL(__raw_readsb);

#endif

#ifndef __raw_readsw

EXPORT_SYMBOL(__raw_readsw);

#endif

#ifndef __raw_readsl

EXPORT_SYMBOL(__raw_readsl);

#endif

#ifndef __raw_writesb

EXPORT_SYMBOL(__raw_writesb);

#endif

#ifndef __raw_writesw

EXPORT_SYMBOL(__raw_writesw);

#endif

#ifndef __raw_writesl

EXPORT_SYMBOL(__raw_writesl);

#endif



	/* string / mem functions */

EXPORT_SYMBOL(strchr);

EXPORT_SYMBOL(strrchr);

EXPORT_SYMBOL(memset);

EXPORT_SYMBOL(memcpy);

EXPORT_SYMBOL(memmove);

EXPORT_SYMBOL(memchr);

EXPORT_SYMBOL(__memzero);



EXPORT_SYMBOL(mmioset);

EXPORT_SYMBOL(mmiocpy);



#ifdef CONFIG_MMU

EXPORT_SYMBOL(copy_page);



EXPORT_SYMBOL(arm_copy_from_user);

EXPORT_SYMBOL(arm_copy_to_user);

EXPORT_SYMBOL(arm_clear_user);



EXPORT_SYMBOL(__get_user_1);

EXPORT_SYMBOL(__get_user_2);

EXPORT_SYMBOL(__get_user_4);

EXPORT_SYMBOL(__get_user_8);



#ifdef __ARMEB__

EXPORT_SYMBOL(__get_user_64t_1);

EXPORT_SYMBOL(__get_user_64t_2);

EXPORT_SYMBOL(__get_user_64t_4);

EXPORT_SYMBOL(__get_user_32t_8);

#endif



EXPORT_SYMBOL(__put_user_1);

EXPORT_SYMBOL(__put_user_2);

EXPORT_SYMBOL(__put_user_4);

EXPORT_SYMBOL(__put_user_8);

#endif



	/* gcc lib functions */

EXPORT_SYMBOL(__ashldi3);

EXPORT_SYMBOL(__ashrdi3);

EXPORT_SYMBOL(__divsi3);

EXPORT_SYMBOL(__lshrdi3);

EXPORT_SYMBOL(__modsi3);

EXPORT_SYMBOL(__muldi3);

EXPORT_SYMBOL(__ucmpdi2);

EXPORT_SYMBOL(__udivsi3);

EXPORT_SYMBOL(__umodsi3);

EXPORT_SYMBOL(__do_div64);

EXPORT_SYMBOL(__bswapsi2);

EXPORT_SYMBOL(__bswapdi2);



#ifdef CONFIG_AEABI

EXPORT_SYMBOL(__aeabi_idiv);

EXPORT_SYMBOL(__aeabi_idivmod);

EXPORT_SYMBOL(__aeabi_lasr);

EXPORT_SYMBOL(__aeabi_llsl);

EXPORT_SYMBOL(__aeabi_llsr);

EXPORT_SYMBOL(__aeabi_lmul);

EXPORT_SYMBOL(__aeabi_uidiv);

EXPORT_SYMBOL(__aeabi_uidivmod);

EXPORT_SYMBOL(__aeabi_ulcmp);

#endif



	/* bitops */

EXPORT_SYMBOL(_set_bit);

EXPORT_SYMBOL(_test_and_set_bit);

EXPORT_SYMBOL(_clear_bit);

EXPORT_SYMBOL(_test_and_clear_bit);

EXPORT_SYMBOL(_change_bit);

EXPORT_SYMBOL(_test_and_change_bit);

EXPORT_SYMBOL(_find_first_zero_bit_le);

EXPORT_SYMBOL(_find_next_zero_bit_le);

EXPORT_SYMBOL(_find_first_bit_le);

EXPORT_SYMBOL(_find_next_bit_le);



#ifdef __ARMEB__

EXPORT_SYMBOL(_find_first_zero_bit_be);

EXPORT_SYMBOL(_find_next_zero_bit_be);

EXPORT_SYMBOL(_find_first_bit_be);

EXPORT_SYMBOL(_find_next_bit_be);

#endif



#ifdef CONFIG_FUNCTION_TRACER

#ifdef CONFIG_OLD_MCOUNT

EXPORT_SYMBOL(mcount);

#endif

EXPORT_SYMBOL(__gnu_mcount_nc);

#endif



#ifdef CONFIG_ARM_PATCH_PHYS_VIRT

EXPORT_SYMBOL(__pv_phys_pfn_offset);

EXPORT_SYMBOL(__pv_offset);

#endif



#ifdef CONFIG_HAVE_ARM_SMCCC

EXPORT_SYMBOL(arm_smccc_smc);

EXPORT_SYMBOL(arm_smccc_hvc);

#endif

arch/arm/kernel/entry-ftrace.S

+0 −3
Original line number Diff line number Diff line
@@ -7,7 +7,6 @@ 
#include <asm/assembler.h>

#include <asm/ftrace.h>

#include <asm/unwind.h>

#include <asm/export.h>



#include "entry-header.S"
@@ -154,7 +153,6 @@ ENTRY(mcount) 
	__mcount _old

#endif

ENDPROC(mcount)

EXPORT_SYMBOL(mcount)



#ifdef CONFIG_DYNAMIC_FTRACE

ENTRY(ftrace_caller_old)
@@ -207,7 +205,6 @@ UNWIND(.fnstart) 
#endif

UNWIND(.fnend)

ENDPROC(__gnu_mcount_nc)

EXPORT_SYMBOL(__gnu_mcount_nc)



#ifdef CONFIG_DYNAMIC_FTRACE

ENTRY(ftrace_caller)