forked from analogdevicesinc/linux
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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: David S. Miller <[email protected]>
- Loading branch information
Showing
179 changed files
with
1,243 additions
and
678 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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: [email protected] | |
| 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 <[email protected]> | ||
| L: [email protected] | ||
| W: https://01.org/linux-acpi | ||
| B: https://bugzilla.kernel.org | ||
| S: Supported | ||
| F: drivers/acpi/fan.c | ||
|
|
||
|
|
@@ -328,13 +333,15 @@ ACPI THERMAL DRIVER | |
| M: Zhang Rui <[email protected]> | ||
| L: [email protected] | ||
| W: https://01.org/linux-acpi | ||
| B: https://bugzilla.kernel.org | ||
| S: Supported | ||
| F: drivers/acpi/*thermal* | ||
|
|
||
| ACPI VIDEO DRIVER | ||
| M: Zhang Rui <[email protected]> | ||
| L: [email protected] | ||
| 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" <[email protected]> | ||
| M: Pavel Machek <[email protected]> | ||
| L: [email protected] | ||
| 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" <[email protected]> | ||
| L: [email protected] | ||
| 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" <[email protected]> | |
| M: Len Brown <[email protected]> | ||
| M: Pavel Machek <[email protected]> | ||
| L: [email protected] | ||
| B: https://bugzilla.kernel.org | ||
| S: Supported | ||
| F: Documentation/power/ | ||
| F: arch/x86/kernel/acpi/ | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,183 @@ | ||
| /* | ||
| * 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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.