From b224f70b8b738484d84540925e1556b4876d7b33 Mon Sep 17 00:00:00 2001 From: Dmitry Ilyin Date: Sun, 21 Aug 2022 21:32:44 +0300 Subject: [PATCH] Remove diff lines --- ..._kernel-4.9.37_sdk-V100R001C00SPC020.patch | 549 ------------------ 1 file changed, 549 deletions(-) diff --git a/br-ext-chip-goke/board/gk7205v200/kernel/patches/00_gk7205v200_kernel-4.9.37_sdk-V100R001C00SPC020.patch b/br-ext-chip-goke/board/gk7205v200/kernel/patches/00_gk7205v200_kernel-4.9.37_sdk-V100R001C00SPC020.patch index d10c6356..c198b895 100644 --- a/br-ext-chip-goke/board/gk7205v200/kernel/patches/00_gk7205v200_kernel-4.9.37_sdk-V100R001C00SPC020.patch +++ b/br-ext-chip-goke/board/gk7205v200/kernel/patches/00_gk7205v200_kernel-4.9.37_sdk-V100R001C00SPC020.patch @@ -1,20 +1,16 @@ -diff -urN linux-4.9.37/arch/alpha/kernel/.gitignore linux-4.9.y/arch/alpha/kernel/.gitignore --- linux-4.9.37/arch/alpha/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/alpha/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/arc/boot/.gitignore linux-4.9.y/arch/arc/boot/.gitignore --- linux-4.9.37/arch/arc/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arc/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -*.dtb* -uImage -diff -urN linux-4.9.37/arch/arc/kernel/.gitignore linux-4.9.y/arch/arc/kernel/.gitignore --- linux-4.9.37/arch/arc/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arc/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/arm/boot/compressed/.gitignore linux-4.9.y/arch/arm/boot/compressed/.gitignore --- linux-4.9.37/arch/arm/boot/compressed/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/compressed/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,17 +0,0 @@ @@ -35,7 +31,6 @@ diff -urN linux-4.9.37/arch/arm/boot/compressed/.gitignore linux-4.9.y/arch/arm/ -fdt_wip.c -libfdt.h -libfdt_internal.h -diff -urN linux-4.9.37/arch/arm/boot/compressed/head.S linux-4.9.y/arch/arm/boot/compressed/head.S --- linux-4.9.37/arch/arm/boot/compressed/head.S 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/compressed/head.S 2021-06-07 13:01:32.000000000 +0300 @@ -218,6 +218,21 @@ @@ -60,7 +55,6 @@ diff -urN linux-4.9.37/arch/arm/boot/compressed/head.S linux-4.9.y/arch/arm/boot blcs cache_on restart: adr r0, LC0 -diff -urN linux-4.9.37/arch/arm/boot/dts/gk7202v300-demb.dts linux-4.9.y/arch/arm/boot/dts/gk7202v300-demb.dts --- linux-4.9.37/arch/arm/boot/dts/gk7202v300-demb.dts 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/dts/gk7202v300-demb.dts 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,151 @@ @@ -215,7 +209,6 @@ diff -urN linux-4.9.37/arch/arm/boot/dts/gk7202v300-demb.dts linux-4.9.y/arch/ar + status = "okay"; +}; + -diff -urN linux-4.9.37/arch/arm/boot/dts/gk7202v300.dtsi linux-4.9.y/arch/arm/boot/dts/gk7202v300.dtsi --- linux-4.9.37/arch/arm/boot/dts/gk7202v300.dtsi 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/dts/gk7202v300.dtsi 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,625 @@ @@ -844,7 +837,6 @@ diff -urN linux-4.9.37/arch/arm/boot/dts/gk7202v300.dtsi linux-4.9.y/arch/arm/bo + }; + }; +}; -diff -urN linux-4.9.37/arch/arm/boot/dts/gk7205v200-demb.dts linux-4.9.y/arch/arm/boot/dts/gk7205v200-demb.dts --- linux-4.9.37/arch/arm/boot/dts/gk7205v200-demb.dts 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/dts/gk7205v200-demb.dts 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,151 @@ @@ -999,7 +991,6 @@ diff -urN linux-4.9.37/arch/arm/boot/dts/gk7205v200-demb.dts linux-4.9.y/arch/ar + status = "okay"; +}; + -diff -urN linux-4.9.37/arch/arm/boot/dts/gk7205v200.dtsi linux-4.9.y/arch/arm/boot/dts/gk7205v200.dtsi --- linux-4.9.37/arch/arm/boot/dts/gk7205v200.dtsi 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/dts/gk7205v200.dtsi 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,625 @@ @@ -1628,7 +1619,6 @@ diff -urN linux-4.9.37/arch/arm/boot/dts/gk7205v200.dtsi linux-4.9.y/arch/arm/bo + }; + }; +}; -diff -urN linux-4.9.37/arch/arm/boot/dts/gk7205v300-demb.dts linux-4.9.y/arch/arm/boot/dts/gk7205v300-demb.dts --- linux-4.9.37/arch/arm/boot/dts/gk7205v300-demb.dts 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/dts/gk7205v300-demb.dts 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,159 @@ @@ -1791,7 +1781,6 @@ diff -urN linux-4.9.37/arch/arm/boot/dts/gk7205v300-demb.dts linux-4.9.y/arch/ar + status = "okay"; +}; + -diff -urN linux-4.9.37/arch/arm/boot/dts/gk7205v300.dtsi linux-4.9.y/arch/arm/boot/dts/gk7205v300.dtsi --- linux-4.9.37/arch/arm/boot/dts/gk7205v300.dtsi 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/dts/gk7205v300.dtsi 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,644 @@ @@ -2439,7 +2428,6 @@ diff -urN linux-4.9.37/arch/arm/boot/dts/gk7205v300.dtsi linux-4.9.y/arch/arm/bo + }; + }; +}; -diff -urN linux-4.9.37/arch/arm/boot/dts/gk7605v100-demb.dts linux-4.9.y/arch/arm/boot/dts/gk7605v100-demb.dts --- linux-4.9.37/arch/arm/boot/dts/gk7605v100-demb.dts 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/dts/gk7605v100-demb.dts 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,159 @@ @@ -2602,7 +2590,6 @@ diff -urN linux-4.9.37/arch/arm/boot/dts/gk7605v100-demb.dts linux-4.9.y/arch/ar + status = "okay"; +}; + -diff -urN linux-4.9.37/arch/arm/boot/dts/gk7605v100.dtsi linux-4.9.y/arch/arm/boot/dts/gk7605v100.dtsi --- linux-4.9.37/arch/arm/boot/dts/gk7605v100.dtsi 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/dts/gk7605v100.dtsi 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,644 @@ @@ -3250,7 +3237,6 @@ diff -urN linux-4.9.37/arch/arm/boot/dts/gk7605v100.dtsi linux-4.9.y/arch/arm/bo + }; + }; +}; -diff -urN linux-4.9.37/arch/arm/boot/dts/Makefile linux-4.9.y/arch/arm/boot/dts/Makefile --- linux-4.9.37/arch/arm/boot/dts/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/dts/Makefile 2021-06-07 13:01:32.000000000 +0300 @@ -174,6 +174,14 @@ @@ -3268,7 +3254,6 @@ diff -urN linux-4.9.37/arch/arm/boot/dts/Makefile linux-4.9.y/arch/arm/boot/dts/ dtb-$(CONFIG_ARCH_INTEGRATOR) += \ integratorap.dtb \ integratorcp.dtb -diff -urN linux-4.9.37/arch/arm/boot/.gitignore linux-4.9.y/arch/arm/boot/.gitignore --- linux-4.9.37/arch/arm/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,6 +0,0 @@ @@ -3278,7 +3263,6 @@ diff -urN linux-4.9.37/arch/arm/boot/.gitignore linux-4.9.y/arch/arm/boot/.gitig -bootpImage -uImage -*.dtb -diff -urN linux-4.9.37/arch/arm/boot/Makefile linux-4.9.y/arch/arm/boot/Makefile --- linux-4.9.37/arch/arm/boot/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/boot/Makefile 2021-06-07 13:01:32.000000000 +0300 @@ -16,6 +16,8 @@ @@ -3324,7 +3308,6 @@ diff -urN linux-4.9.37/arch/arm/boot/Makefile linux-4.9.y/arch/arm/boot/Makefile @$(check_for_multiple_loadaddr) $(call if_changed,uimage) -diff -urN linux-4.9.37/arch/arm/configs/gk7202v300_emmc_defconfig linux-4.9.y/arch/arm/configs/gk7202v300_emmc_defconfig --- linux-4.9.37/arch/arm/configs/gk7202v300_emmc_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7202v300_emmc_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,2858 @@ @@ -6186,7 +6169,6 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7202v300_emmc_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/configs/gk7202v300_full_defconfig linux-4.9.y/arch/arm/configs/gk7202v300_full_defconfig --- linux-4.9.37/arch/arm/configs/gk7202v300_full_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7202v300_full_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,2858 @@ @@ -9048,7 +9030,6 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7202v300_full_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/configs/gk7202v300_mini_defconfig linux-4.9.y/arch/arm/configs/gk7202v300_mini_defconfig --- linux-4.9.37/arch/arm/configs/gk7202v300_mini_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7202v300_mini_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,1791 @@ @@ -10843,7 +10824,6 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7202v300_mini_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/configs/gk7205v200_emmc_defconfig linux-4.9.y/arch/arm/configs/gk7205v200_emmc_defconfig --- linux-4.9.37/arch/arm/configs/gk7205v200_emmc_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7205v200_emmc_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,2975 @@ @@ -13822,7 +13802,6 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7205v200_emmc_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/configs/gk7205v200_full_defconfig linux-4.9.y/arch/arm/configs/gk7205v200_full_defconfig --- linux-4.9.37/arch/arm/configs/gk7205v200_full_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7205v200_full_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,2981 @@ @@ -16807,7 +16786,6 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7205v200_full_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/configs/gk7205v200_mini_defconfig linux-4.9.y/arch/arm/configs/gk7205v200_mini_defconfig --- linux-4.9.37/arch/arm/configs/gk7205v200_mini_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7205v200_mini_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,2050 @@ @@ -18861,7 +18839,6 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7205v200_mini_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/configs/gk7205v300_emmc_defconfig linux-4.9.y/arch/arm/configs/gk7205v300_emmc_defconfig --- linux-4.9.37/arch/arm/configs/gk7205v300_emmc_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7205v300_emmc_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,2975 @@ @@ -21840,7 +21817,6 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7205v300_emmc_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/configs/gk7205v300_full_defconfig linux-4.9.y/arch/arm/configs/gk7205v300_full_defconfig --- linux-4.9.37/arch/arm/configs/gk7205v300_full_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7205v300_full_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,2975 @@ @@ -24819,7 +24795,6 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7205v300_full_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/configs/gk7605v100_emmc_defconfig linux-4.9.y/arch/arm/configs/gk7605v100_emmc_defconfig --- linux-4.9.37/arch/arm/configs/gk7605v100_emmc_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7605v100_emmc_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,2975 @@ @@ -27798,7 +27773,6 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7605v100_emmc_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/configs/gk7605v100_full_defconfig linux-4.9.y/arch/arm/configs/gk7605v100_full_defconfig --- linux-4.9.37/arch/arm/configs/gk7605v100_full_defconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/configs/gk7605v100_full_defconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,2975 @@ @@ -30777,14 +30751,12 @@ diff -urN linux-4.9.37/arch/arm/configs/gk7605v100_full_defconfig linux-4.9.y/ar +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_SBITMAP=y +# CONFIG_VIRTUALIZATION is not set -diff -urN linux-4.9.37/arch/arm/crypto/.gitignore linux-4.9.y/arch/arm/crypto/.gitignore --- linux-4.9.37/arch/arm/crypto/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/crypto/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -aesbs-core.S -sha256-core.S -sha512-core.S -diff -urN linux-4.9.37/arch/arm/Kconfig linux-4.9.y/arch/arm/Kconfig --- linux-4.9.37/arch/arm/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/Kconfig 2021-06-07 13:01:32.000000000 +0300 @@ -330,7 +330,7 @@ @@ -30805,7 +30777,6 @@ diff -urN linux-4.9.37/arch/arm/Kconfig linux-4.9.y/arch/arm/Kconfig source "arch/arm/mach-integrator/Kconfig" source "arch/arm/mach-iop32x/Kconfig" -diff -urN linux-4.9.37/arch/arm/Kconfig.debug linux-4.9.y/arch/arm/Kconfig.debug --- linux-4.9.37/arch/arm/Kconfig.debug 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/Kconfig.debug 2021-06-07 13:01:32.000000000 +0300 @@ -287,6 +287,38 @@ @@ -30867,12 +30838,10 @@ diff -urN linux-4.9.37/arch/arm/Kconfig.debug linux-4.9.y/arch/arm/Kconfig.debug default 0xfeb24000 if DEBUG_RK3X_UART0 default 0xfeb26000 if DEBUG_RK3X_UART1 default 0xfeb30c00 if DEBUG_KEYSTONE_UART0 -diff -urN linux-4.9.37/arch/arm/kernel/.gitignore linux-4.9.y/arch/arm/kernel/.gitignore --- linux-4.9.37/arch/arm/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/arm/kvm/handle_exit.c linux-4.9.y/arch/arm/kvm/handle_exit.c --- linux-4.9.37/arch/arm/kvm/handle_exit.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/kvm/handle_exit.c 2021-06-07 13:01:32.000000000 +0300 @@ -21,7 +21,7 @@ @@ -30884,7 +30853,6 @@ diff -urN linux-4.9.37/arch/arm/kvm/handle_exit.c linux-4.9.y/arch/arm/kvm/handl #include #include "trace.h" -diff -urN linux-4.9.37/arch/arm/mach-goke/include/mach/io.h linux-4.9.y/arch/arm/mach-goke/include/mach/io.h --- linux-4.9.37/arch/arm/mach-goke/include/mach/io.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/include/mach/io.h 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,6 @@ @@ -30894,7 +30862,6 @@ diff -urN linux-4.9.37/arch/arm/mach-goke/include/mach/io.h linux-4.9.y/arch/arm +#ifndef __ASM_ARM_ARCH_IO_H +#define __ASM_ARM_ARCH_IO_H +#endif -diff -urN linux-4.9.37/arch/arm/mach-goke/include/mach/platform.h linux-4.9.y/arch/arm/mach-goke/include/mach/platform.h --- linux-4.9.37/arch/arm/mach-goke/include/mach/platform.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/include/mach/platform.h 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,6 @@ @@ -30904,7 +30871,6 @@ diff -urN linux-4.9.37/arch/arm/mach-goke/include/mach/platform.h linux-4.9.y/ar +#ifndef __GOKE_PLATFORM_H__ +#define __GOKE_PLATFORM_H__ +#endif /* End of __GOKE_PLATFORM_H__ */ -diff -urN linux-4.9.37/arch/arm/mach-goke/Kconfig linux-4.9.y/arch/arm/mach-goke/Kconfig --- linux-4.9.37/arch/arm/mach-goke/Kconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/Kconfig 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,71 @@ @@ -30979,7 +30945,6 @@ diff -urN linux-4.9.37/arch/arm/mach-goke/Kconfig linux-4.9.y/arch/arm/mach-goke +endmenu + +endif -diff -urN linux-4.9.37/arch/arm/mach-goke/mach-common.h linux-4.9.y/arch/arm/mach-goke/mach-common.h --- linux-4.9.37/arch/arm/mach-goke/mach-common.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/mach-common.h 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,12 @@ @@ -30995,7 +30960,6 @@ diff -urN linux-4.9.37/arch/arm/mach-goke/mach-common.h linux-4.9.y/arch/arm/mac +int bsp_boot_secondary(unsigned int cpu, struct task_struct *idle); +#endif /* CONFIG_SMP */ +#endif /* __SMP_COMMON_H */ -diff -urN linux-4.9.37/arch/arm/mach-goke/mach-gk7202v300.c linux-4.9.y/arch/arm/mach-goke/mach-gk7202v300.c --- linux-4.9.37/arch/arm/mach-goke/mach-gk7202v300.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/mach-gk7202v300.c 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,52 @@ @@ -31051,7 +31015,6 @@ diff -urN linux-4.9.37/arch/arm/mach-goke/mach-gk7202v300.c linux-4.9.y/arch/arm + +CPU_METHOD_OF_DECLARE(gk7202v300_smp, "goke,gk7202v300-smp", &bsp_smp_ops); +#endif /* CONFIG_SMP */ -diff -urN linux-4.9.37/arch/arm/mach-goke/mach-gk7205v200.c linux-4.9.y/arch/arm/mach-goke/mach-gk7205v200.c --- linux-4.9.37/arch/arm/mach-goke/mach-gk7205v200.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/mach-gk7205v200.c 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,52 @@ @@ -31107,7 +31070,6 @@ diff -urN linux-4.9.37/arch/arm/mach-goke/mach-gk7205v200.c linux-4.9.y/arch/arm + +CPU_METHOD_OF_DECLARE(gk7205v200_smp, "goke,gk7205v200-smp", &bsp_smp_ops); +#endif /* CONFIG_SMP */ -diff -urN linux-4.9.37/arch/arm/mach-goke/mach-gk7205v300.c linux-4.9.y/arch/arm/mach-goke/mach-gk7205v300.c --- linux-4.9.37/arch/arm/mach-goke/mach-gk7205v300.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/mach-gk7205v300.c 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,52 @@ @@ -31163,7 +31125,6 @@ diff -urN linux-4.9.37/arch/arm/mach-goke/mach-gk7205v300.c linux-4.9.y/arch/arm + +CPU_METHOD_OF_DECLARE(gk7205v300_smp, "goke,gk7205v300-smp", &bsp_smp_ops); +#endif /* CONFIG_SMP */ -diff -urN linux-4.9.37/arch/arm/mach-goke/mach-gk7605v100.c linux-4.9.y/arch/arm/mach-goke/mach-gk7605v100.c --- linux-4.9.37/arch/arm/mach-goke/mach-gk7605v100.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/mach-gk7605v100.c 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,52 @@ @@ -31219,7 +31180,6 @@ diff -urN linux-4.9.37/arch/arm/mach-goke/mach-gk7605v100.c linux-4.9.y/arch/arm + +CPU_METHOD_OF_DECLARE(gk7605v100_smp, "goke,gk7605v100-smp", &bsp_smp_ops); +#endif /* CONFIG_SMP */ -diff -urN linux-4.9.37/arch/arm/mach-goke/Makefile linux-4.9.y/arch/arm/mach-goke/Makefile --- linux-4.9.37/arch/arm/mach-goke/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/Makefile 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,8 @@ @@ -31231,14 +31191,12 @@ diff -urN linux-4.9.37/arch/arm/mach-goke/Makefile linux-4.9.y/arch/arm/mach-gok +obj-$(CONFIG_ARCH_GK7205V300) += mach-gk7205v300.o +obj-$(CONFIG_ARCH_GK7202V300) += mach-gk7202v300.o +obj-$(CONFIG_ARCH_GK7605V100) += mach-gk7605v100.o -diff -urN linux-4.9.37/arch/arm/mach-goke/Makefile.boot linux-4.9.y/arch/arm/mach-goke/Makefile.boot --- linux-4.9.37/arch/arm/mach-goke/Makefile.boot 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/arch/arm/mach-goke/Makefile.boot 2021-06-07 13:01:32.000000000 +0300 @@ -0,0 +1,3 @@ +zreladdr-$(CONFIG_ARCH_GOKE) := $(CONFIG_BSP_ZRELADDR) +params_phys-$(CONFIG_ARCH_GOKE) := $(CONFIG_BSP_PARAMS_PHYS) +initrd_phys-$(CONFIG_ARCH_GOKE) := $(CONFIG_BSP_INITRD_PHYS) -diff -urN linux-4.9.37/arch/arm/Makefile linux-4.9.y/arch/arm/Makefile --- linux-4.9.37/arch/arm/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/Makefile 2021-06-07 13:01:32.000000000 +0300 @@ -170,6 +170,7 @@ @@ -31260,7 +31218,6 @@ diff -urN linux-4.9.37/arch/arm/Makefile linux-4.9.y/arch/arm/Makefile export TEXT_OFFSET GZFLAGS MMUEXT # Do we have FASTFPE? -diff -urN linux-4.9.37/arch/arm/mm/dma-mapping.c linux-4.9.y/arch/arm/mm/dma-mapping.c --- linux-4.9.37/arch/arm/mm/dma-mapping.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/mm/dma-mapping.c 2021-06-07 13:01:32.000000000 +0300 @@ -275,7 +275,7 @@ @@ -31304,7 +31261,6 @@ diff -urN linux-4.9.37/arch/arm/mm/dma-mapping.c linux-4.9.y/arch/arm/mm/dma-map + dmac_map_area(kaddr, size, dir); +} +EXPORT_SYMBOL(bsp_dmac_map_area); -diff -urN linux-4.9.37/arch/arm/mm/init.c linux-4.9.y/arch/arm/mm/init.c --- linux-4.9.37/arch/arm/mm/init.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/mm/init.c 2021-06-07 13:01:32.000000000 +0300 @@ -268,6 +268,12 @@ @@ -31320,14 +31276,12 @@ diff -urN linux-4.9.37/arch/arm/mm/init.c linux-4.9.y/arch/arm/mm/init.c early_init_fdt_reserve_self(); early_init_fdt_scan_reserved_mem(); -diff -urN linux-4.9.37/arch/arm/vdso/.gitignore linux-4.9.y/arch/arm/vdso/.gitignore --- linux-4.9.37/arch/arm/vdso/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/vdso/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -vdso.lds -vdso.so.raw -vdsomunge -diff -urN linux-4.9.37/arch/arm/vdso/vgettimeofday.c linux-4.9.y/arch/arm/vdso/vgettimeofday.c --- linux-4.9.37/arch/arm/vdso/vgettimeofday.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm/vdso/vgettimeofday.c 2021-06-07 13:01:32.000000000 +0300 @@ -115,7 +115,7 @@ @@ -31339,29 +31293,24 @@ diff -urN linux-4.9.37/arch/arm/vdso/vgettimeofday.c linux-4.9.y/arch/arm/vdso/v static notrace u64 get_ns(struct vdso_data *vdata) { -diff -urN linux-4.9.37/arch/arm64/boot/dts/.gitignore linux-4.9.y/arch/arm64/boot/dts/.gitignore --- linux-4.9.37/arch/arm64/boot/dts/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm64/boot/dts/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -*.dtb -diff -urN linux-4.9.37/arch/arm64/boot/.gitignore linux-4.9.y/arch/arm64/boot/.gitignore --- linux-4.9.37/arch/arm64/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm64/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -Image -Image.gz -diff -urN linux-4.9.37/arch/arm64/kernel/.gitignore linux-4.9.y/arch/arm64/kernel/.gitignore --- linux-4.9.37/arch/arm64/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm64/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/arm64/kernel/vdso/.gitignore linux-4.9.y/arch/arm64/kernel/vdso/.gitignore --- linux-4.9.37/arch/arm64/kernel/vdso/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/arm64/kernel/vdso/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -vdso.lds -vdso-offsets.h -diff -urN linux-4.9.37/arch/avr32/boot/images/.gitignore linux-4.9.y/arch/avr32/boot/images/.gitignore --- linux-4.9.37/arch/avr32/boot/images/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/avr32/boot/images/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -31369,52 +31318,43 @@ diff -urN linux-4.9.37/arch/avr32/boot/images/.gitignore linux-4.9.y/arch/avr32/ -uImage.srec -vmlinux.cso -sfdwarf.log -diff -urN linux-4.9.37/arch/avr32/kernel/.gitignore linux-4.9.y/arch/avr32/kernel/.gitignore --- linux-4.9.37/arch/avr32/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/avr32/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/blackfin/boot/.gitignore linux-4.9.y/arch/blackfin/boot/.gitignore --- linux-4.9.37/arch/blackfin/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/blackfin/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -vmImage* -vmlinux* -uImage* -diff -urN linux-4.9.37/arch/blackfin/kernel/.gitignore linux-4.9.y/arch/blackfin/kernel/.gitignore --- linux-4.9.37/arch/blackfin/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/blackfin/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/cris/boot/.gitignore linux-4.9.y/arch/cris/boot/.gitignore --- linux-4.9.37/arch/cris/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/cris/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -Image -zImage -diff -urN linux-4.9.37/arch/.gitignore linux-4.9.y/arch/.gitignore --- linux-4.9.37/arch/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -i386 -x86_64 -diff -urN linux-4.9.37/arch/ia64/kernel/.gitignore linux-4.9.y/arch/ia64/kernel/.gitignore --- linux-4.9.37/arch/ia64/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/ia64/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -gate.lds -vmlinux.lds -diff -urN linux-4.9.37/arch/m32r/kernel/.gitignore linux-4.9.y/arch/m32r/kernel/.gitignore --- linux-4.9.37/arch/m32r/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/m32r/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/m68k/kernel/.gitignore linux-4.9.y/arch/m68k/kernel/.gitignore --- linux-4.9.37/arch/m68k/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/m68k/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/metag/boot/.gitignore linux-4.9.y/arch/metag/boot/.gitignore --- linux-4.9.37/arch/metag/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/metag/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -31422,24 +31362,20 @@ diff -urN linux-4.9.37/arch/metag/boot/.gitignore linux-4.9.y/arch/metag/boot/.g -uImage* -ramdisk.* -*.dtb* -diff -urN linux-4.9.37/arch/metag/kernel/.gitignore linux-4.9.y/arch/metag/kernel/.gitignore --- linux-4.9.37/arch/metag/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/metag/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/microblaze/boot/.gitignore linux-4.9.y/arch/microblaze/boot/.gitignore --- linux-4.9.37/arch/microblaze/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/microblaze/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -*.dtb -linux.bin* -simpleImage.* -diff -urN linux-4.9.37/arch/microblaze/kernel/.gitignore linux-4.9.y/arch/microblaze/kernel/.gitignore --- linux-4.9.37/arch/microblaze/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/microblaze/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/mips/boot/.gitignore linux-4.9.y/arch/mips/boot/.gitignore --- linux-4.9.37/arch/mips/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/mips/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,8 +0,0 @@ @@ -31451,17 +31387,14 @@ diff -urN linux-4.9.37/arch/mips/boot/.gitignore linux-4.9.y/arch/mips/boot/.git -calc_vmlinuz_load_addr -uImage -*.dtb -diff -urN linux-4.9.37/arch/mips/boot/tools/.gitignore linux-4.9.y/arch/mips/boot/tools/.gitignore --- linux-4.9.37/arch/mips/boot/tools/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/mips/boot/tools/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -relocs -diff -urN linux-4.9.37/arch/mips/kernel/.gitignore linux-4.9.y/arch/mips/kernel/.gitignore --- linux-4.9.37/arch/mips/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/mips/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/mips/vdso/.gitignore linux-4.9.y/arch/mips/vdso/.gitignore --- linux-4.9.37/arch/mips/vdso/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/mips/vdso/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -31469,17 +31402,14 @@ diff -urN linux-4.9.37/arch/mips/vdso/.gitignore linux-4.9.y/arch/mips/vdso/.git -vdso-*image.c -genvdso -vdso*.lds -diff -urN linux-4.9.37/arch/mn10300/boot/.gitignore linux-4.9.y/arch/mn10300/boot/.gitignore --- linux-4.9.37/arch/mn10300/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/mn10300/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -zImage -diff -urN linux-4.9.37/arch/parisc/kernel/.gitignore linux-4.9.y/arch/parisc/kernel/.gitignore --- linux-4.9.37/arch/parisc/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/parisc/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/powerpc/boot/.gitignore linux-4.9.y/arch/powerpc/boot/.gitignore --- linux-4.9.37/arch/powerpc/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/powerpc/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,44 +0,0 @@ @@ -31527,68 +31457,56 @@ diff -urN linux-4.9.37/arch/powerpc/boot/.gitignore linux-4.9.y/arch/powerpc/boo -libfdt.h -libfdt_internal.h - -diff -urN linux-4.9.37/arch/powerpc/kernel/.gitignore linux-4.9.y/arch/powerpc/kernel/.gitignore --- linux-4.9.37/arch/powerpc/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/powerpc/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/powerpc/kernel/vdso32/.gitignore linux-4.9.y/arch/powerpc/kernel/vdso32/.gitignore --- linux-4.9.37/arch/powerpc/kernel/vdso32/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/powerpc/kernel/vdso32/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -vdso32.lds -vdso32.so.dbg -diff -urN linux-4.9.37/arch/powerpc/kernel/vdso64/.gitignore linux-4.9.y/arch/powerpc/kernel/vdso64/.gitignore --- linux-4.9.37/arch/powerpc/kernel/vdso64/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/powerpc/kernel/vdso64/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -vdso64.lds -vdso64.so.dbg -diff -urN linux-4.9.37/arch/powerpc/platforms/cell/spufs/.gitignore linux-4.9.y/arch/powerpc/platforms/cell/spufs/.gitignore --- linux-4.9.37/arch/powerpc/platforms/cell/spufs/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/powerpc/platforms/cell/spufs/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -spu_save_dump.h -spu_restore_dump.h -diff -urN linux-4.9.37/arch/s390/boot/compressed/.gitignore linux-4.9.y/arch/s390/boot/compressed/.gitignore --- linux-4.9.37/arch/s390/boot/compressed/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/s390/boot/compressed/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -sizes.h -vmlinux -vmlinux.lds -diff -urN linux-4.9.37/arch/s390/boot/.gitignore linux-4.9.y/arch/s390/boot/.gitignore --- linux-4.9.37/arch/s390/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/s390/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -image -bzImage -diff -urN linux-4.9.37/arch/s390/kernel/.gitignore linux-4.9.y/arch/s390/kernel/.gitignore --- linux-4.9.37/arch/s390/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/s390/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/s390/kernel/vdso32/.gitignore linux-4.9.y/arch/s390/kernel/vdso32/.gitignore --- linux-4.9.37/arch/s390/kernel/vdso32/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/s390/kernel/vdso32/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vdso32.lds -diff -urN linux-4.9.37/arch/s390/kernel/vdso64/.gitignore linux-4.9.y/arch/s390/kernel/vdso64/.gitignore --- linux-4.9.37/arch/s390/kernel/vdso64/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/s390/kernel/vdso64/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vdso64.lds -diff -urN linux-4.9.37/arch/s390/tools/.gitignore linux-4.9.y/arch/s390/tools/.gitignore --- linux-4.9.37/arch/s390/tools/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/s390/tools/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -gen_facilities -diff -urN linux-4.9.37/arch/sh/boot/compressed/.gitignore linux-4.9.y/arch/sh/boot/compressed/.gitignore --- linux-4.9.37/arch/sh/boot/compressed/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/sh/boot/compressed/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.bin.* -diff -urN linux-4.9.37/arch/sh/boot/compressed/vmlinux.scr linux-4.9.y/arch/sh/boot/compressed/vmlinux.scr --- linux-4.9.37/arch/sh/boot/compressed/vmlinux.scr 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/sh/boot/compressed/vmlinux.scr 1970-01-01 03:00:00.000000000 +0300 @@ -1,10 +0,0 @@ @@ -31602,14 +31520,12 @@ diff -urN linux-4.9.37/arch/sh/boot/compressed/vmlinux.scr linux-4.9.y/arch/sh/b - input_data_end = .; - } -} -diff -urN linux-4.9.37/arch/sh/boot/.gitignore linux-4.9.y/arch/sh/boot/.gitignore --- linux-4.9.37/arch/sh/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/sh/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -zImage -vmlinux* -uImage* -diff -urN linux-4.9.37/arch/sh/boot/romimage/vmlinux.scr linux-4.9.y/arch/sh/boot/romimage/vmlinux.scr --- linux-4.9.37/arch/sh/boot/romimage/vmlinux.scr 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/sh/boot/romimage/vmlinux.scr 1970-01-01 03:00:00.000000000 +0300 @@ -1,8 +0,0 @@ @@ -31621,17 +31537,14 @@ diff -urN linux-4.9.37/arch/sh/boot/romimage/vmlinux.scr linux-4.9.y/arch/sh/boo - end_data = .; - } -} -diff -urN linux-4.9.37/arch/sh/kernel/.gitignore linux-4.9.y/arch/sh/kernel/.gitignore --- linux-4.9.37/arch/sh/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/sh/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/sh/kernel/vsyscall/.gitignore linux-4.9.y/arch/sh/kernel/vsyscall/.gitignore --- linux-4.9.37/arch/sh/kernel/vsyscall/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/sh/kernel/vsyscall/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vsyscall.lds -diff -urN linux-4.9.37/arch/sparc/boot/.gitignore linux-4.9.y/arch/sparc/boot/.gitignore --- linux-4.9.37/arch/sparc/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/sparc/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,8 +0,0 @@ @@ -31643,19 +31556,16 @@ diff -urN linux-4.9.37/arch/sparc/boot/.gitignore linux-4.9.y/arch/sparc/boot/.g -vmlinux.aout -piggyback - -diff -urN linux-4.9.37/arch/sparc/kernel/.gitignore linux-4.9.y/arch/sparc/kernel/.gitignore --- linux-4.9.37/arch/sparc/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/sparc/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/arch/um/.gitignore linux-4.9.y/arch/um/.gitignore --- linux-4.9.37/arch/um/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/um/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -kernel/config.c -kernel/config.tmp -kernel/vmlinux.lds -diff -urN linux-4.9.37/arch/unicore32/.gitignore linux-4.9.y/arch/unicore32/.gitignore --- linux-4.9.37/arch/unicore32/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/unicore32/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,21 +0,0 @@ @@ -31680,7 +31590,6 @@ diff -urN linux-4.9.37/arch/unicore32/.gitignore linux-4.9.y/arch/unicore32/.git -boot/compressed/piggy.gzip -boot/compressed/vmlinux -boot/compressed/vmlinux.lds -diff -urN linux-4.9.37/arch/x86/boot/compressed/.gitignore linux-4.9.y/arch/x86/boot/compressed/.gitignore --- linux-4.9.37/arch/x86/boot/compressed/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/boot/compressed/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,6 +0,0 @@ @@ -31690,7 +31599,6 @@ diff -urN linux-4.9.37/arch/x86/boot/compressed/.gitignore linux-4.9.y/arch/x86/ -vmlinux.lds -mkpiggy -piggy.S -diff -urN linux-4.9.37/arch/x86/boot/.gitignore linux-4.9.y/arch/x86/boot/.gitignore --- linux-4.9.37/arch/x86/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,9 +0,0 @@ @@ -31703,12 +31611,10 @@ diff -urN linux-4.9.37/arch/x86/boot/.gitignore linux-4.9.y/arch/x86/boot/.gitig -setup -setup.bin -setup.elf -diff -urN linux-4.9.37/arch/x86/boot/tools/.gitignore linux-4.9.y/arch/x86/boot/tools/.gitignore --- linux-4.9.37/arch/x86/boot/tools/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/boot/tools/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -build -diff -urN linux-4.9.37/arch/x86/entry/vdso/.gitignore linux-4.9.y/arch/x86/entry/vdso/.gitignore --- linux-4.9.37/arch/x86/entry/vdso/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/entry/vdso/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,7 +0,0 @@ @@ -31719,12 +31625,10 @@ diff -urN linux-4.9.37/arch/x86/entry/vdso/.gitignore linux-4.9.y/arch/x86/entry -vdso32-int80-syms.lds -vdso-image-*.c -vdso2c -diff -urN linux-4.9.37/arch/x86/entry/vdso/vdso32/.gitignore linux-4.9.y/arch/x86/entry/vdso/vdso32/.gitignore --- linux-4.9.37/arch/x86/entry/vdso/vdso32/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/entry/vdso/vdso32/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vdso32.lds -diff -urN linux-4.9.37/arch/x86/.gitignore linux-4.9.y/arch/x86/.gitignore --- linux-4.9.37/arch/x86/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,6 +0,0 @@ @@ -31734,66 +31638,55 @@ diff -urN linux-4.9.37/arch/x86/.gitignore linux-4.9.y/arch/x86/.gitignore -purgatory/kexec-purgatory.c -purgatory/purgatory.ro - -diff -urN linux-4.9.37/arch/x86/kernel/cpu/.gitignore linux-4.9.y/arch/x86/kernel/cpu/.gitignore --- linux-4.9.37/arch/x86/kernel/cpu/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/kernel/cpu/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -capflags.c -diff -urN linux-4.9.37/arch/x86/kernel/.gitignore linux-4.9.y/arch/x86/kernel/.gitignore --- linux-4.9.37/arch/x86/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -vsyscall.lds -vsyscall_32.lds -vmlinux.lds -diff -urN linux-4.9.37/arch/x86/lib/.gitignore linux-4.9.y/arch/x86/lib/.gitignore --- linux-4.9.37/arch/x86/lib/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/lib/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -inat-tables.c -diff -urN linux-4.9.37/arch/x86/realmode/rm/.gitignore linux-4.9.y/arch/x86/realmode/rm/.gitignore --- linux-4.9.37/arch/x86/realmode/rm/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/realmode/rm/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -pasyms.h -realmode.lds -realmode.relocs -diff -urN linux-4.9.37/arch/x86/tools/.gitignore linux-4.9.y/arch/x86/tools/.gitignore --- linux-4.9.37/arch/x86/tools/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/tools/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -relocs -diff -urN linux-4.9.37/arch/x86/um/vdso/.gitignore linux-4.9.y/arch/x86/um/vdso/.gitignore --- linux-4.9.37/arch/x86/um/vdso/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/x86/um/vdso/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -vdso-syms.lds -vdso.lds -diff -urN linux-4.9.37/arch/xtensa/boot/boot-elf/.gitignore linux-4.9.y/arch/xtensa/boot/boot-elf/.gitignore --- linux-4.9.37/arch/xtensa/boot/boot-elf/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/xtensa/boot/boot-elf/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -boot.lds -diff -urN linux-4.9.37/arch/xtensa/boot/.gitignore linux-4.9.y/arch/xtensa/boot/.gitignore --- linux-4.9.37/arch/xtensa/boot/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/xtensa/boot/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -uImage -zImage.redboot -*.dtb -diff -urN linux-4.9.37/arch/xtensa/boot/lib/.gitignore linux-4.9.y/arch/xtensa/boot/lib/.gitignore --- linux-4.9.37/arch/xtensa/boot/lib/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/xtensa/boot/lib/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -inffast.c -inflate.c -inftrees.c -diff -urN linux-4.9.37/arch/xtensa/kernel/.gitignore linux-4.9.y/arch/xtensa/kernel/.gitignore --- linux-4.9.37/arch/xtensa/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/arch/xtensa/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vmlinux.lds -diff -urN linux-4.9.37/certs/.gitignore linux-4.9.y/certs/.gitignore --- linux-4.9.37/certs/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/certs/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -31801,22 +31694,18 @@ diff -urN linux-4.9.37/certs/.gitignore linux-4.9.y/certs/.gitignore -# Generated files -# -x509_certificate_list -diff -urN linux-4.9.37/crypto/asymmetric_keys/.gitignore linux-4.9.y/crypto/asymmetric_keys/.gitignore --- linux-4.9.37/crypto/asymmetric_keys/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/crypto/asymmetric_keys/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -*-asn1.[ch] -diff -urN linux-4.9.37/crypto/.gitignore linux-4.9.y/crypto/.gitignore --- linux-4.9.37/crypto/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/crypto/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -*-asn1.[ch] -diff -urN linux-4.9.37/Documentation/arm/SH-Mobile/.gitignore linux-4.9.y/Documentation/arm/SH-Mobile/.gitignore --- linux-4.9.37/Documentation/arm/SH-Mobile/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/Documentation/arm/SH-Mobile/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -vrl4 -diff -urN linux-4.9.37/Documentation/DocBook/.gitignore linux-4.9.y/Documentation/DocBook/.gitignore --- linux-4.9.37/Documentation/DocBook/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/Documentation/DocBook/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,17 +0,0 @@ @@ -31837,19 +31726,16 @@ diff -urN linux-4.9.37/Documentation/DocBook/.gitignore linux-4.9.y/Documentatio -*.db -media-indices.tmpl -media-entities.tmpl -diff -urN linux-4.9.37/Documentation/.gitignore linux-4.9.y/Documentation/.gitignore --- linux-4.9.37/Documentation/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/Documentation/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -output -*.pyc -diff -urN linux-4.9.37/Documentation/vm/.gitignore linux-4.9.y/Documentation/vm/.gitignore --- linux-4.9.37/Documentation/vm/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/Documentation/vm/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -page-types -slabinfo -diff -urN linux-4.9.37/drivers/atm/.gitignore linux-4.9.y/drivers/atm/.gitignore --- linux-4.9.37/drivers/atm/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/atm/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,5 +0,0 @@ @@ -31858,7 +31744,6 @@ diff -urN linux-4.9.37/drivers/atm/.gitignore linux-4.9.y/drivers/atm/.gitignore -fore200e_pca_fw.c -pca200e.bin -pca200e_ecd.bin2 -diff -urN linux-4.9.37/drivers/base/dma-contiguous.c linux-4.9.y/drivers/base/dma-contiguous.c --- linux-4.9.37/drivers/base/dma-contiguous.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/base/dma-contiguous.c 2021-06-07 13:01:33.000000000 +0300 @@ -195,6 +195,7 @@ @@ -31877,7 +31762,6 @@ diff -urN linux-4.9.37/drivers/base/dma-contiguous.c linux-4.9.y/drivers/base/dm /* * Support for reserved memory regions defined in device tree -diff -urN linux-4.9.37/drivers/char/random.c linux-4.9.y/drivers/char/random.c --- linux-4.9.37/drivers/char/random.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/char/random.c 2021-06-07 13:01:33.000000000 +0300 @@ -812,7 +812,7 @@ @@ -31907,7 +31791,6 @@ diff -urN linux-4.9.37/drivers/char/random.c linux-4.9.y/drivers/char/random.c "(%zd bytes read)\n", current->comm, nbytes); spin_lock_irqsave(&primary_crng.lock, flags); -diff -urN linux-4.9.37/drivers/clk/goke/clk.c linux-4.9.y/drivers/clk/goke/clk.c --- linux-4.9.37/drivers/clk/goke/clk.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/clk.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,188 @@ @@ -32100,7 +31983,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/clk.c linux-4.9.y/drivers/clk/goke/clk.c +} +EXPORT_SYMBOL_GPL(gk_clk_register_gate); \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/clk/goke/clk-gk7202v300.c linux-4.9.y/drivers/clk/goke/clk-gk7202v300.c --- linux-4.9.37/drivers/clk/goke/clk-gk7202v300.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/clk-gk7202v300.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,233 @@ @@ -32337,7 +32219,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/clk-gk7202v300.c linux-4.9.y/drivers/clk + +CLK_OF_DECLARE(gk7202v300_clk, "goke,gk7202v300-clock", gk7202v300_clk_init); + -diff -urN linux-4.9.37/drivers/clk/goke/clk-gk7205v200.c linux-4.9.y/drivers/clk/goke/clk-gk7205v200.c --- linux-4.9.37/drivers/clk/goke/clk-gk7205v200.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/clk-gk7205v200.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,235 @@ @@ -32576,7 +32457,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/clk-gk7205v200.c linux-4.9.y/drivers/clk + +CLK_OF_DECLARE(gk7205v200_clk, "goke,gk7205v200-clock", gk7205v200_clk_init); + -diff -urN linux-4.9.37/drivers/clk/goke/clk-gk7205v300.c linux-4.9.y/drivers/clk/goke/clk-gk7205v300.c --- linux-4.9.37/drivers/clk/goke/clk-gk7205v300.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/clk-gk7205v300.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,233 @@ @@ -32813,7 +32693,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/clk-gk7205v300.c linux-4.9.y/drivers/clk + +CLK_OF_DECLARE(gk7205v300_clk, "goke,gk7205v300-clock", gk7205v300_clk_init); + -diff -urN linux-4.9.37/drivers/clk/goke/clk-gk7605v100.c linux-4.9.y/drivers/clk/goke/clk-gk7605v100.c --- linux-4.9.37/drivers/clk/goke/clk-gk7605v100.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/clk-gk7605v100.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,233 @@ @@ -33050,7 +32929,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/clk-gk7605v100.c linux-4.9.y/drivers/clk + +CLK_OF_DECLARE(gk7605v100_clk, "goke,gk7605v100-clock", gk7605v100_clk_init); + -diff -urN linux-4.9.37/drivers/clk/goke/clk.h linux-4.9.y/drivers/clk/goke/clk.h --- linux-4.9.37/drivers/clk/goke/clk.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/clk.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,90 @@ @@ -33144,7 +33022,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/clk.h linux-4.9.y/drivers/clk/goke/clk.h +gk_clk_unregister(gate) + +#endif /* __GOKE_CLK_H */ -diff -urN linux-4.9.37/drivers/clk/goke/Kconfig linux-4.9.y/drivers/clk/goke/Kconfig --- linux-4.9.37/drivers/clk/goke/Kconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,39 @@ @@ -33187,7 +33064,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/Kconfig linux-4.9.y/drivers/clk/goke/Kco + help + Build reset controller driver for Goke device chipsets. + -diff -urN linux-4.9.37/drivers/clk/goke/Makefile linux-4.9.y/drivers/clk/goke/Makefile --- linux-4.9.37/drivers/clk/goke/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,10 @@ @@ -33201,7 +33077,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/Makefile linux-4.9.y/drivers/clk/goke/Ma +obj-$(CONFIG_COMMON_CLK_GK7202V300) += clk-gk7202v300.o +obj-$(CONFIG_COMMON_CLK_GK7605V100) += clk-gk7605v100.o +obj-$(CONFIG_RESET_GOKE) += reset.o -diff -urN linux-4.9.37/drivers/clk/goke/reset.c linux-4.9.y/drivers/clk/goke/reset.c --- linux-4.9.37/drivers/clk/goke/reset.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/reset.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,113 @@ @@ -33318,7 +33193,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/reset.c linux-4.9.y/drivers/clk/goke/res + return reset_controller_register(&rstc->rcdev); +} +EXPORT_SYMBOL_GPL(gk_reset_init); -diff -urN linux-4.9.37/drivers/clk/goke/reset.h linux-4.9.y/drivers/clk/goke/reset.h --- linux-4.9.37/drivers/clk/goke/reset.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/clk/goke/reset.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,15 @@ @@ -33337,7 +33211,6 @@ diff -urN linux-4.9.37/drivers/clk/goke/reset.h linux-4.9.y/drivers/clk/goke/res +#endif + +#endif /* __GOKE_RESET_H */ -diff -urN linux-4.9.37/drivers/clk/Kconfig linux-4.9.y/drivers/clk/Kconfig --- linux-4.9.37/drivers/clk/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/clk/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -210,5 +210,6 @@ @@ -33347,7 +33220,6 @@ diff -urN linux-4.9.37/drivers/clk/Kconfig linux-4.9.y/drivers/clk/Kconfig +source "drivers/clk/goke/Kconfig" endmenu -diff -urN linux-4.9.37/drivers/clk/Makefile linux-4.9.y/drivers/clk/Makefile --- linux-4.9.37/drivers/clk/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/clk/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -92,3 +92,4 @@ @@ -33356,7 +33228,6 @@ diff -urN linux-4.9.37/drivers/clk/Makefile linux-4.9.y/drivers/clk/Makefile obj-$(CONFIG_ARCH_ZYNQ) += zynq/ +obj-$(CONFIG_ARCH_GOKE) += goke/ \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/clocksource/arm_arch_timer.c linux-4.9.y/drivers/clocksource/arm_arch_timer.c --- linux-4.9.37/drivers/clocksource/arm_arch_timer.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/clocksource/arm_arch_timer.c 2021-06-07 13:01:33.000000000 +0300 @@ -449,7 +449,10 @@ @@ -33371,7 +33242,6 @@ diff -urN linux-4.9.37/drivers/clocksource/arm_arch_timer.c linux-4.9.y/drivers/ arch_timer_set_cntkctl(cntkctl); } -diff -urN linux-4.9.37/drivers/clocksource/Kconfig linux-4.9.y/drivers/clocksource/Kconfig --- linux-4.9.37/drivers/clocksource/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/clocksource/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -305,6 +305,14 @@ @@ -33389,7 +33259,6 @@ diff -urN linux-4.9.37/drivers/clocksource/Kconfig linux-4.9.y/drivers/clocksour config FSL_ERRATUM_A008585 bool "Workaround for Freescale/NXP Erratum A-008585" default y -diff -urN linux-4.9.37/drivers/clocksource/timer-sp804.c linux-4.9.y/drivers/clocksource/timer-sp804.c --- linux-4.9.37/drivers/clocksource/timer-sp804.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/clocksource/timer-sp804.c 2021-06-07 13:01:33.000000000 +0300 @@ -235,6 +235,10 @@ @@ -33403,18 +33272,15 @@ diff -urN linux-4.9.37/drivers/clocksource/timer-sp804.c linux-4.9.y/drivers/clo if (initialized || !of_device_is_available(np)) { ret = -EINVAL; goto err; -diff -urN linux-4.9.37/drivers/crypto/qat/qat_common/.gitignore linux-4.9.y/drivers/crypto/qat/qat_common/.gitignore --- linux-4.9.37/drivers/crypto/qat/qat_common/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/crypto/qat/qat_common/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -*-asn1.[ch] -diff -urN linux-4.9.37/drivers/crypto/vmx/.gitignore linux-4.9.y/drivers/crypto/vmx/.gitignore --- linux-4.9.37/drivers/crypto/vmx/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/crypto/vmx/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -aesp8-ppc.S -ghashp8-ppc.S -diff -urN linux-4.9.37/drivers/dma/edmac_goke.c linux-4.9.y/drivers/dma/edmac_goke.c --- linux-4.9.37/drivers/dma/edmac_goke.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/dma/edmac_goke.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,1286 @@ @@ -34704,7 +34570,6 @@ diff -urN linux-4.9.37/drivers/dma/edmac_goke.c linux-4.9.y/drivers/dma/edmac_go + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Goke"); -diff -urN linux-4.9.37/drivers/dma/edmac_goke.h linux-4.9.y/drivers/dma/edmac_goke.h --- linux-4.9.37/drivers/dma/edmac_goke.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/dma/edmac_goke.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,132 @@ @@ -34840,7 +34705,6 @@ diff -urN linux-4.9.37/drivers/dma/edmac_goke.h linux-4.9.y/drivers/dma/edmac_go +#define CCFG_EN 0x1 + +#endif -diff -urN linux-4.9.37/drivers/dma/Kconfig linux-4.9.y/drivers/dma/Kconfig --- linux-4.9.37/drivers/dma/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/dma/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -564,6 +564,19 @@ @@ -34863,7 +34727,6 @@ diff -urN linux-4.9.37/drivers/dma/Kconfig linux-4.9.y/drivers/dma/Kconfig # driver files source "drivers/dma/bestcomm/Kconfig" -diff -urN linux-4.9.37/drivers/dma/Makefile linux-4.9.y/drivers/dma/Makefile --- linux-4.9.37/drivers/dma/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/dma/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -67,6 +67,7 @@ @@ -34874,7 +34737,6 @@ diff -urN linux-4.9.37/drivers/dma/Makefile linux-4.9.y/drivers/dma/Makefile obj-y += qcom/ obj-y += xilinx/ -diff -urN linux-4.9.37/drivers/dma-buf/fence.c linux-4.9.y/drivers/dma-buf/fence.c --- linux-4.9.37/drivers/dma-buf/fence.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/dma-buf/fence.c 2021-06-07 13:01:33.000000000 +0300 @@ -68,6 +68,8 @@ @@ -34910,7 +34772,6 @@ diff -urN linux-4.9.37/drivers/dma-buf/fence.c linux-4.9.y/drivers/dma-buf/fence spin_unlock_irqrestore(fence->lock, flags); -diff -urN linux-4.9.37/drivers/dma-buf/reservation.c linux-4.9.y/drivers/dma-buf/reservation.c --- linux-4.9.37/drivers/dma-buf/reservation.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/dma-buf/reservation.c 2021-06-07 13:01:33.000000000 +0300 @@ -280,18 +280,24 @@ @@ -35130,7 +34991,6 @@ diff -urN linux-4.9.37/drivers/dma-buf/reservation.c linux-4.9.y/drivers/dma-buf - goto retry; } EXPORT_SYMBOL_GPL(reservation_object_test_signaled_rcu); -diff -urN linux-4.9.37/drivers/dma-buf/sw_sync.c linux-4.9.y/drivers/dma-buf/sw_sync.c --- linux-4.9.37/drivers/dma-buf/sw_sync.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/dma-buf/sw_sync.c 2021-06-07 13:01:33.000000000 +0300 @@ -234,6 +234,13 @@ @@ -35165,7 +35025,6 @@ diff -urN linux-4.9.37/drivers/dma-buf/sw_sync.c linux-4.9.y/drivers/dma-buf/sw_ err = -ENOMEM; goto err; } -diff -urN linux-4.9.37/drivers/dma-buf/_sw_sync.h linux-4.9.y/drivers/dma-buf/_sw_sync.h --- linux-4.9.37/drivers/dma-buf/_sw_sync.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/dma-buf/_sw_sync.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,32 @@ @@ -35201,7 +35060,6 @@ diff -urN linux-4.9.37/drivers/dma-buf/_sw_sync.h linux-4.9.y/drivers/dma-buf/_s +#define SW_SYNC_IOC_INC _IOW(SW_SYNC_IOC_MAGIC, 1, __u32) + +#endif /* _UAPI_LINUX_SW_SYNC_H */ -diff -urN linux-4.9.37/drivers/dma-buf/sw_sync.h linux-4.9.y/drivers/dma-buf/sw_sync.h --- linux-4.9.37/drivers/dma-buf/sw_sync.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/dma-buf/sw_sync.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,43 @@ @@ -35248,7 +35106,6 @@ diff -urN linux-4.9.37/drivers/dma-buf/sw_sync.h linux-4.9.y/drivers/dma-buf/sw_ +struct sync_pt *bsp_sw_sync_pt_create(struct sw_sync_timeline *obj, u32 value); + +#endif /* _LINUX_SW_SYNC_H */ -diff -urN linux-4.9.37/drivers/dma-buf/sync.c linux-4.9.y/drivers/dma-buf/sync.c --- linux-4.9.37/drivers/dma-buf/sync.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/dma-buf/sync.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,738 @@ @@ -35990,7 +35847,6 @@ diff -urN linux-4.9.37/drivers/dma-buf/sync.c linux-4.9.y/drivers/dma-buf/sync.c +}; +#endif + -diff -urN linux-4.9.37/drivers/dma-buf/sync_file.c linux-4.9.y/drivers/dma-buf/sync_file.c --- linux-4.9.37/drivers/dma-buf/sync_file.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/dma-buf/sync_file.c 2021-06-07 13:01:33.000000000 +0300 @@ -67,9 +67,10 @@ @@ -36134,7 +35990,6 @@ diff -urN linux-4.9.37/drivers/dma-buf/sync_file.c linux-4.9.y/drivers/dma-buf/s case SYNC_IOC_MERGE: return sync_file_ioctl_merge(sync_file, arg); -diff -urN linux-4.9.37/drivers/dma-buf/_sync.h linux-4.9.y/drivers/dma-buf/_sync.h --- linux-4.9.37/drivers/dma-buf/_sync.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/dma-buf/_sync.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,97 @@ @@ -36235,7 +36090,6 @@ diff -urN linux-4.9.37/drivers/dma-buf/_sync.h linux-4.9.y/drivers/dma-buf/_sync + struct sync_fence_info_data) + +#endif /* _UAPI_LINUX_SYNC_H */ -diff -urN linux-4.9.37/drivers/dma-buf/sync.h linux-4.9.y/drivers/dma-buf/sync.h --- linux-4.9.37/drivers/dma-buf/sync.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/dma-buf/sync.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,363 @@ @@ -36602,12 +36456,10 @@ diff -urN linux-4.9.37/drivers/dma-buf/sync.h linux-4.9.y/drivers/dma-buf/sync.h +#endif + +#endif /* _LINUX_SYNC_H */ -diff -urN linux-4.9.37/drivers/eisa/.gitignore linux-4.9.y/drivers/eisa/.gitignore --- linux-4.9.37/drivers/eisa/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/eisa/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -devlist.h -diff -urN linux-4.9.37/drivers/fence/Kconfig linux-4.9.y/drivers/fence/Kconfig --- linux-4.9.37/drivers/fence/Kconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/fence/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,8 @@ @@ -36619,13 +36471,11 @@ diff -urN linux-4.9.37/drivers/fence/Kconfig linux-4.9.y/drivers/fence/Kconfig + select SYNC_FILE + help + Goke fence suppport -diff -urN linux-4.9.37/drivers/fence/Makefile linux-4.9.y/drivers/fence/Makefile --- linux-4.9.37/drivers/fence/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/fence/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,2 @@ + +obj-y += sw_sync.o sync.o sync_debug.o -diff -urN linux-4.9.37/drivers/fence/sw_sync.c linux-4.9.y/drivers/fence/sw_sync.c --- linux-4.9.37/drivers/fence/sw_sync.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/fence/sw_sync.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,277 @@ @@ -36906,7 +36756,6 @@ diff -urN linux-4.9.37/drivers/fence/sw_sync.c linux-4.9.y/drivers/fence/sw_sync +device_initcall(sw_sync_device_init); + +#endif /* CONFIG_SW_SYNC_USER */ -diff -urN linux-4.9.37/drivers/fence/_sw_sync.h linux-4.9.y/drivers/fence/_sw_sync.h --- linux-4.9.37/drivers/fence/_sw_sync.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/fence/_sw_sync.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,32 @@ @@ -36942,7 +36791,6 @@ diff -urN linux-4.9.37/drivers/fence/_sw_sync.h linux-4.9.y/drivers/fence/_sw_sy +#define SW_SYNC_IOC_INC _IOW(SW_SYNC_IOC_MAGIC, 1, __u32) + +#endif /* _UAPI_LINUX_SW_SYNC_H */ -diff -urN linux-4.9.37/drivers/fence/sw_sync.h linux-4.9.y/drivers/fence/sw_sync.h --- linux-4.9.37/drivers/fence/sw_sync.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/fence/sw_sync.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,60 @@ @@ -37006,7 +36854,6 @@ diff -urN linux-4.9.37/drivers/fence/sw_sync.h linux-4.9.y/drivers/fence/sw_sync +#endif /* IS_ENABLED(CONFIG_SW_SYNC) */ + +#endif /* _LINUX_SW_SYNC_H */ -diff -urN linux-4.9.37/drivers/fence/sync.c linux-4.9.y/drivers/fence/sync.c --- linux-4.9.37/drivers/fence/sync.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/fence/sync.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,740 @@ @@ -37750,7 +37597,6 @@ diff -urN linux-4.9.37/drivers/fence/sync.c linux-4.9.y/drivers/fence/sync.c +}; +#endif + -diff -urN linux-4.9.37/drivers/fence/sync_debug.c linux-4.9.y/drivers/fence/sync_debug.c --- linux-4.9.37/drivers/fence/sync_debug.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/fence/sync_debug.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,259 @@ @@ -38013,7 +37859,6 @@ diff -urN linux-4.9.37/drivers/fence/sync_debug.c linux-4.9.y/drivers/fence/sync +} + +#endif -diff -urN linux-4.9.37/drivers/fence/_sync.h linux-4.9.y/drivers/fence/_sync.h --- linux-4.9.37/drivers/fence/_sync.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/fence/_sync.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,97 @@ @@ -38114,7 +37959,6 @@ diff -urN linux-4.9.37/drivers/fence/_sync.h linux-4.9.y/drivers/fence/_sync.h + struct sync_fence_info_data) + +#endif /* _UAPI_LINUX_SYNC_H */ -diff -urN linux-4.9.37/drivers/fence/sync.h linux-4.9.y/drivers/fence/sync.h --- linux-4.9.37/drivers/fence/sync.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/fence/sync.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,363 @@ @@ -38481,7 +38325,6 @@ diff -urN linux-4.9.37/drivers/fence/sync.h linux-4.9.y/drivers/fence/sync.h +#endif + +#endif /* _LINUX_SYNC_H */ -diff -urN linux-4.9.37/drivers/firmware/psci.c linux-4.9.y/drivers/firmware/psci.c --- linux-4.9.37/drivers/firmware/psci.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/firmware/psci.c 2021-06-07 13:01:33.000000000 +0300 @@ -59,7 +59,9 @@ @@ -38551,7 +38394,6 @@ diff -urN linux-4.9.37/drivers/firmware/psci.c linux-4.9.y/drivers/firmware/psci return psci_probe(); } -diff -urN linux-4.9.37/drivers/goke/cma/cma.c linux-4.9.y/drivers/goke/cma/cma.c --- linux-4.9.37/drivers/goke/cma/cma.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/goke/cma/cma.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,178 @@ @@ -38733,7 +38575,6 @@ diff -urN linux-4.9.37/drivers/goke/cma/cma.c linux-4.9.y/drivers/goke/cma/cma.c + return 0; +} +RESERVEDMEM_OF_DECLARE(cma, "mmz", mmz_setup); -diff -urN linux-4.9.37/drivers/goke/cma/Kconfig linux-4.9.y/drivers/goke/cma/Kconfig --- linux-4.9.37/drivers/goke/cma/Kconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/goke/cma/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,16 @@ @@ -38753,13 +38594,11 @@ diff -urN linux-4.9.37/drivers/goke/cma/Kconfig linux-4.9.y/drivers/goke/cma/Kco + help + Support advance sharing CMA memory with the heap. + CMA Multiplex Ratio will be improved when this macro defined. -diff -urN linux-4.9.37/drivers/goke/cma/Makefile linux-4.9.y/drivers/goke/cma/Makefile --- linux-4.9.37/drivers/goke/cma/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/goke/cma/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,2 @@ + +obj-$(CONFIG_CMA) += cma.o -diff -urN linux-4.9.37/drivers/goke/Kconfig linux-4.9.y/drivers/goke/Kconfig --- linux-4.9.37/drivers/goke/Kconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/goke/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,4 @@ @@ -38767,12 +38606,10 @@ diff -urN linux-4.9.37/drivers/goke/Kconfig linux-4.9.y/drivers/goke/Kconfig + +source "drivers/goke/cma/Kconfig" +endmenu -diff -urN linux-4.9.37/drivers/goke/Makefile linux-4.9.y/drivers/goke/Makefile --- linux-4.9.37/drivers/goke/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/goke/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1 @@ +obj-$(CONFIG_CMA) += cma/ -diff -urN linux-4.9.37/drivers/gpio/gpio-pl061.c linux-4.9.y/drivers/gpio/gpio-pl061.c --- linux-4.9.37/drivers/gpio/gpio-pl061.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/gpio/gpio-pl061.c 2021-06-07 13:01:33.000000000 +0300 @@ -208,6 +208,25 @@ @@ -38849,14 +38686,12 @@ diff -urN linux-4.9.37/drivers/gpio/gpio-pl061.c linux-4.9.y/drivers/gpio/gpio-p for (i = 0; i < PL061_GPIO_NR; i++) { if (pdata) { -diff -urN linux-4.9.37/drivers/gpu/drm/radeon/.gitignore linux-4.9.y/drivers/gpu/drm/radeon/.gitignore --- linux-4.9.37/drivers/gpu/drm/radeon/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/gpu/drm/radeon/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -mkregtable -*_reg_safe.h - -diff -urN linux-4.9.37/drivers/i2c/busses/i2c-goke.c linux-4.9.y/drivers/i2c/busses/i2c-goke.c --- linux-4.9.37/drivers/i2c/busses/i2c-goke.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/i2c/busses/i2c-goke.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,967 @@ @@ -39827,7 +39662,6 @@ diff -urN linux-4.9.37/drivers/i2c/busses/i2c-goke.c linux-4.9.y/drivers/i2c/bus +MODULE_AUTHOR("Goke"); +MODULE_DESCRIPTION("GOKE I2C Bus driver"); +MODULE_LICENSE("GPL v2"); -diff -urN linux-4.9.37/drivers/i2c/busses/Kconfig linux-4.9.y/drivers/i2c/busses/Kconfig --- linux-4.9.37/drivers/i2c/busses/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/i2c/busses/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -555,6 +555,16 @@ @@ -39868,7 +39702,6 @@ diff -urN linux-4.9.37/drivers/i2c/busses/Kconfig linux-4.9.y/drivers/i2c/busses + The i2c_msg maximum LEN of i2c support DMA,range from i2c_msg minimum LEN to 4090, + because DMA for 0xFFC one-time largest data transfers; endmenu -diff -urN linux-4.9.37/drivers/i2c/busses/Makefile linux-4.9.y/drivers/i2c/busses/Makefile --- linux-4.9.37/drivers/i2c/busses/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/i2c/busses/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -51,6 +51,7 @@ @@ -39879,7 +39712,6 @@ diff -urN linux-4.9.37/drivers/i2c/busses/Makefile linux-4.9.y/drivers/i2c/busse obj-$(CONFIG_I2C_HIGHLANDER) += i2c-highlander.o obj-$(CONFIG_I2C_HIX5HD2) += i2c-hix5hd2.o obj-$(CONFIG_I2C_IBM_IIC) += i2c-ibm_iic.o -diff -urN linux-4.9.37/drivers/i2c/i2c-dev.c linux-4.9.y/drivers/i2c/i2c-dev.c --- linux-4.9.37/drivers/i2c/i2c-dev.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/i2c/i2c-dev.c 2021-06-07 13:01:33.000000000 +0300 @@ -170,6 +170,9 @@ @@ -39904,7 +39736,6 @@ diff -urN linux-4.9.37/drivers/i2c/i2c-dev.c linux-4.9.y/drivers/i2c/i2c-dev.c data_ptrs[i] = (u8 __user *)rdwr_pa[i].buf; rdwr_pa[i].buf = memdup_user(data_ptrs[i], rdwr_pa[i].len); -diff -urN linux-4.9.37/drivers/irqchip/irq-gic.c linux-4.9.y/drivers/irqchip/irq-gic.c --- linux-4.9.37/drivers/irqchip/irq-gic.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/irqchip/irq-gic.c 2021-06-07 13:01:33.000000000 +0300 @@ -1069,7 +1069,9 @@ @@ -39941,7 +39772,6 @@ diff -urN linux-4.9.37/drivers/irqchip/irq-gic.c linux-4.9.y/drivers/irqchip/irq ret = gic_cpu_init(gic); if (ret) goto error; -diff -urN linux-4.9.37/drivers/irqchip/irq-gic-v3.c linux-4.9.y/drivers/irqchip/irq-gic-v3.c --- linux-4.9.37/drivers/irqchip/irq-gic-v3.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/irqchip/irq-gic-v3.c 2021-06-07 13:01:33.000000000 +0300 @@ -120,11 +120,10 @@ @@ -39981,7 +39811,6 @@ diff -urN linux-4.9.37/drivers/irqchip/irq-gic-v3.c linux-4.9.y/drivers/irqchip/ /* * Find out how many interrupts are supported. * The GIC only supports up to 1020 interrupt sources (SGI+PPI+SPI) -diff -urN linux-4.9.37/drivers/Kconfig linux-4.9.y/drivers/Kconfig --- linux-4.9.37/drivers/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -202,4 +202,6 @@ @@ -39991,7 +39820,6 @@ diff -urN linux-4.9.37/drivers/Kconfig linux-4.9.y/drivers/Kconfig +source "drivers/goke/Kconfig" + endmenu -diff -urN linux-4.9.37/drivers/Makefile linux-4.9.y/drivers/Makefile --- linux-4.9.37/drivers/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -70,6 +70,7 @@ @@ -40007,7 +39835,6 @@ diff -urN linux-4.9.37/drivers/Makefile linux-4.9.y/drivers/Makefile obj-$(CONFIG_NVMEM) += nvmem/ obj-$(CONFIG_FPGA) += fpga/ +obj-$(CONFIG_ARCH_GOKE) += goke/ -diff -urN linux-4.9.37/drivers/media/usb/uvc/uvc_video.c linux-4.9.y/drivers/media/usb/uvc/uvc_video.c --- linux-4.9.37/drivers/media/usb/uvc/uvc_video.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/media/usb/uvc/uvc_video.c 2021-06-07 13:01:33.000000000 +0300 @@ -1467,6 +1467,7 @@ @@ -40028,7 +39855,6 @@ diff -urN linux-4.9.37/drivers/media/usb/uvc/uvc_video.c linux-4.9.y/drivers/med case USB_SPEED_WIRELESS: psize = usb_endpoint_maxp(&ep->desc); return psize; -diff -urN linux-4.9.37/drivers/media/v4l2-core/videobuf2-v4l2.c linux-4.9.y/drivers/media/v4l2-core/videobuf2-v4l2.c --- linux-4.9.37/drivers/media/v4l2-core/videobuf2-v4l2.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/media/v4l2-core/videobuf2-v4l2.c 2021-06-07 13:01:33.000000000 +0300 @@ -146,7 +146,6 @@ @@ -40039,7 +39865,6 @@ diff -urN linux-4.9.37/drivers/media/v4l2-core/videobuf2-v4l2.c linux-4.9.y/driv pr_warn("use of bytesused == 0 is deprecated and will be removed in the future,\n"); if (vb->vb2_queue->allow_zero_bytesused) -diff -urN linux-4.9.37/drivers/mfd/goke_fmc.c linux-4.9.y/drivers/mfd/goke_fmc.c --- linux-4.9.37/drivers/mfd/goke_fmc.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mfd/goke_fmc.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,121 @@ @@ -40164,7 +39989,6 @@ diff -urN linux-4.9.37/drivers/mfd/goke_fmc.c linux-4.9.y/drivers/mfd/goke_fmc.c + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Goke Flash Memory Controller Driver"); -diff -urN linux-4.9.37/drivers/mfd/Kconfig linux-4.9.y/drivers/mfd/Kconfig --- linux-4.9.37/drivers/mfd/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mfd/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -358,6 +358,16 @@ @@ -40184,7 +40008,6 @@ diff -urN linux-4.9.37/drivers/mfd/Kconfig linux-4.9.y/drivers/mfd/Kconfig config HTC_PASIC3 tristate "HTC PASIC3 LED/DS1WM chip support" select MFD_CORE -diff -urN linux-4.9.37/drivers/mfd/Makefile linux-4.9.y/drivers/mfd/Makefile --- linux-4.9.37/drivers/mfd/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mfd/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -180,6 +180,7 @@ @@ -40195,7 +40018,6 @@ diff -urN linux-4.9.37/drivers/mfd/Makefile linux-4.9.y/drivers/mfd/Makefile obj-$(CONFIG_MFD_INTEL_LPSS) += intel-lpss.o obj-$(CONFIG_MFD_INTEL_LPSS_PCI) += intel-lpss-pci.o obj-$(CONFIG_MFD_INTEL_LPSS_ACPI) += intel-lpss-acpi.o -diff -urN linux-4.9.37/drivers/mmc/card/block.c linux-4.9.y/drivers/mmc/card/block.c --- linux-4.9.37/drivers/mmc/card/block.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/card/block.c 2021-06-07 13:01:33.000000000 +0300 @@ -63,6 +63,8 @@ @@ -41288,7 +41110,6 @@ diff -urN linux-4.9.37/drivers/mmc/card/block.c linux-4.9.y/drivers/mmc/card/blo } static int mmc_blk_resume(struct device *dev) -diff -urN linux-4.9.37/drivers/mmc/card/queue.c linux-4.9.y/drivers/mmc/card/queue.c --- linux-4.9.37/drivers/mmc/card/queue.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/card/queue.c 2021-06-07 13:01:33.000000000 +0300 @@ -179,6 +179,122 @@ @@ -41649,7 +41470,6 @@ diff -urN linux-4.9.37/drivers/mmc/card/queue.c linux-4.9.y/drivers/mmc/card/que + mq->mqrq_cmdq = NULL; +} + -diff -urN linux-4.9.37/drivers/mmc/card/queue.h linux-4.9.y/drivers/mmc/card/queue.h --- linux-4.9.37/drivers/mmc/card/queue.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/card/queue.h 2021-06-07 13:01:33.000000000 +0300 @@ -48,6 +48,7 @@ @@ -41696,7 +41516,6 @@ diff -urN linux-4.9.37/drivers/mmc/card/queue.h linux-4.9.y/drivers/mmc/card/que +extern int mmc_cmdq_init(struct mmc_queue *mq, struct mmc_card *card); +extern void mmc_cmdq_clean(struct mmc_queue *mq, struct mmc_card *card); #endif -diff -urN linux-4.9.37/drivers/mmc/core/core.c linux-4.9.y/drivers/mmc/core/core.c --- linux-4.9.37/drivers/mmc/core/core.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/core/core.c 2021-06-07 13:01:33.000000000 +0300 @@ -569,7 +569,12 @@ @@ -42176,7 +41995,6 @@ diff -urN linux-4.9.37/drivers/mmc/core/core.c linux-4.9.y/drivers/mmc/core/core if (freqs[i] <= host->f_min) break; } -diff -urN linux-4.9.37/drivers/mmc/core/mmc.c linux-4.9.y/drivers/mmc/core/mmc.c --- linux-4.9.37/drivers/mmc/core/mmc.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/core/mmc.c 2021-06-07 13:01:33.000000000 +0300 @@ -528,6 +528,9 @@ @@ -42328,7 +42146,6 @@ diff -urN linux-4.9.37/drivers/mmc/core/mmc.c linux-4.9.y/drivers/mmc/core/mmc.c mmc_attach_bus(host, &mmc_ops); if (host->ocr_avail_mmc) host->ocr_avail = host->ocr_avail_mmc; -diff -urN linux-4.9.37/drivers/mmc/core/mmc_ops.c linux-4.9.y/drivers/mmc/core/mmc_ops.c --- linux-4.9.37/drivers/mmc/core/mmc_ops.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/core/mmc_ops.c 2021-06-07 13:01:33.000000000 +0300 @@ -456,6 +456,45 @@ @@ -42399,7 +42216,6 @@ diff -urN linux-4.9.37/drivers/mmc/core/mmc_ops.c linux-4.9.y/drivers/mmc/core/m + return mmc_wait_for_cmd(host, &cmd, 0); +} +EXPORT_SYMBOL(mmc_discard_queue); -diff -urN linux-4.9.37/drivers/mmc/core/mmc_ops.h linux-4.9.y/drivers/mmc/core/mmc_ops.h --- linux-4.9.37/drivers/mmc/core/mmc_ops.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/core/mmc_ops.h 2021-06-07 13:01:33.000000000 +0300 @@ -27,6 +27,7 @@ @@ -42410,7 +42226,6 @@ diff -urN linux-4.9.37/drivers/mmc/core/mmc_ops.h linux-4.9.y/drivers/mmc/core/m int mmc_switch_status_error(struct mmc_host *host, u32 status); int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value, unsigned int timeout_ms, bool use_busy_signal, bool send_status, -diff -urN linux-4.9.37/drivers/mmc/core/sd.c linux-4.9.y/drivers/mmc/core/sd.c --- linux-4.9.37/drivers/mmc/core/sd.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/core/sd.c 2021-06-07 13:01:33.000000000 +0300 @@ -1236,6 +1236,7 @@ @@ -42421,7 +42236,6 @@ diff -urN linux-4.9.37/drivers/mmc/core/sd.c linux-4.9.y/drivers/mmc/core/sd.c mmc_attach_bus(host, &mmc_sd_ops); if (host->ocr_avail_sd) host->ocr_avail = host->ocr_avail_sd; -diff -urN linux-4.9.37/drivers/mmc/core/sdio.c linux-4.9.y/drivers/mmc/core/sdio.c --- linux-4.9.37/drivers/mmc/core/sdio.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/core/sdio.c 2021-06-07 13:01:33.000000000 +0300 @@ -28,6 +28,10 @@ @@ -42507,7 +42321,6 @@ diff -urN linux-4.9.37/drivers/mmc/core/sdio.c linux-4.9.y/drivers/mmc/core/sdio +EXPORT_SYMBOL(sdio_reset_comm); +#endif + -diff -urN linux-4.9.37/drivers/mmc/host/Kconfig linux-4.9.y/drivers/mmc/host/Kconfig --- linux-4.9.37/drivers/mmc/host/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -176,6 +176,15 @@ @@ -42544,7 +42357,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/Kconfig linux-4.9.y/drivers/mmc/host/Kco + + If unsure, say N. + -diff -urN linux-4.9.37/drivers/mmc/host/Makefile linux-4.9.y/drivers/mmc/host/Makefile --- linux-4.9.37/drivers/mmc/host/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -70,6 +70,12 @@ @@ -42560,7 +42372,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/Makefile linux-4.9.y/drivers/mmc/host/Ma obj-$(CONFIG_MMC_SDHCI_BCM_KONA) += sdhci-bcm-kona.o obj-$(CONFIG_MMC_SDHCI_IPROC) += sdhci-iproc.o obj-$(CONFIG_MMC_SDHCI_MSM) += sdhci-msm.o -diff -urN linux-4.9.37/drivers/mmc/host/sdhci.c linux-4.9.y/drivers/mmc/host/sdhci.c --- linux-4.9.37/drivers/mmc/host/sdhci.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci.c 2021-06-07 13:01:33.000000000 +0300 @@ -32,6 +32,7 @@ @@ -43340,7 +43151,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci.c linux-4.9.y/drivers/mmc/host/sdh } EXPORT_SYMBOL_GPL(sdhci_remove_host); -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-cmdq.c linux-4.9.y/drivers/mmc/host/sdhci-cmdq.c --- linux-4.9.37/drivers/mmc/host/sdhci-cmdq.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-cmdq.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,1108 @@ @@ -44452,7 +44262,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-cmdq.c linux-4.9.y/drivers/mmc/hos + return err; +} +EXPORT_SYMBOL(cmdq_init); -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-cmdq.h linux-4.9.y/drivers/mmc/host/sdhci-cmdq.h --- linux-4.9.37/drivers/mmc/host/sdhci-cmdq.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-cmdq.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,230 @@ @@ -44686,7 +44495,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-cmdq.h linux-4.9.y/drivers/mmc/hos + bool dma64); +extern struct cmdq_host *cmdq_pltfm_init(struct platform_device *pdev); +#endif -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-gk7202v300.c linux-4.9.y/drivers/mmc/host/sdhci-gk7202v300.c --- linux-4.9.37/drivers/mmc/host/sdhci-gk7202v300.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-gk7202v300.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,495 @@ @@ -45186,7 +44994,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-gk7202v300.c linux-4.9.y/drivers/m +#include "sdhci-goke.c" +#endif \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-gk7205v200.c linux-4.9.y/drivers/mmc/host/sdhci-gk7205v200.c --- linux-4.9.37/drivers/mmc/host/sdhci-gk7205v200.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-gk7205v200.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,495 @@ @@ -45686,7 +45493,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-gk7205v200.c linux-4.9.y/drivers/m +#include "sdhci-goke.c" +#endif \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-gk7205v300.c linux-4.9.y/drivers/mmc/host/sdhci-gk7205v300.c --- linux-4.9.37/drivers/mmc/host/sdhci-gk7205v300.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-gk7205v300.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,508 @@ @@ -46199,7 +46005,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-gk7205v300.c linux-4.9.y/drivers/m +#include "sdhci-goke.c" +#endif \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-gk7605v100.c linux-4.9.y/drivers/mmc/host/sdhci-gk7605v100.c --- linux-4.9.37/drivers/mmc/host/sdhci-gk7605v100.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-gk7605v100.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,508 @@ @@ -46712,7 +46517,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-gk7605v100.c linux-4.9.y/drivers/m +#include "sdhci-goke.c" +#endif \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-goke.c linux-4.9.y/drivers/mmc/host/sdhci-goke.c --- linux-4.9.37/drivers/mmc/host/sdhci-goke.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-goke.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,714 @@ @@ -47430,7 +47234,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-goke.c linux-4.9.y/drivers/mmc/hos + +MODULE_DESCRIPTION("SDHCI driver for goke"); +MODULE_LICENSE("GPL v2"); -diff -urN linux-4.9.37/drivers/mmc/host/sdhci.h linux-4.9.y/drivers/mmc/host/sdhci.h --- linux-4.9.37/drivers/mmc/host/sdhci.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci.h 2021-06-07 13:01:33.000000000 +0300 @@ -20,6 +20,8 @@ @@ -47715,7 +47518,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci.h linux-4.9.y/drivers/mmc/host/sdh + }) + #endif /* __SDHCI_HW_H */ -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-pltfm.c linux-4.9.y/drivers/mmc/host/sdhci-pltfm.c --- linux-4.9.37/drivers/mmc/host/sdhci-pltfm.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-pltfm.c 2021-06-07 13:01:33.000000000 +0300 @@ -209,19 +209,21 @@ @@ -47742,7 +47544,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-pltfm.c linux-4.9.y/drivers/mmc/ho #endif const struct dev_pm_ops sdhci_pltfm_pmops = { -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-pltfm.h linux-4.9.y/drivers/mmc/host/sdhci-pltfm.h --- linux-4.9.37/drivers/mmc/host/sdhci-pltfm.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-pltfm.h 2021-06-07 13:01:33.000000000 +0300 @@ -109,6 +109,8 @@ @@ -47754,7 +47555,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-pltfm.h linux-4.9.y/drivers/mmc/ho extern const struct dev_pm_ops sdhci_pltfm_pmops; #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */ -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-proc.c linux-4.9.y/drivers/mmc/host/sdhci-proc.c --- linux-4.9.37/drivers/mmc/host/sdhci-proc.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-proc.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,272 @@ @@ -48030,7 +47830,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-proc.c linux-4.9.y/drivers/mmc/hos + + return 0; +} -diff -urN linux-4.9.37/drivers/mmc/host/sdhci-proc.h linux-4.9.y/drivers/mmc/host/sdhci-proc.h --- linux-4.9.37/drivers/mmc/host/sdhci-proc.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mmc/host/sdhci-proc.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,29 @@ @@ -48063,7 +47862,6 @@ diff -urN linux-4.9.37/drivers/mmc/host/sdhci-proc.h linux-4.9.y/drivers/mmc/hos +int mci_proc_shutdown(void); + +#endif /* __MCI_PROC_H__ */ -diff -urN linux-4.9.37/drivers/mtd/Makefile linux-4.9.y/drivers/mtd/Makefile --- linux-4.9.37/drivers/mtd/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mtd/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -30,7 +30,7 @@ @@ -48075,7 +47873,6 @@ diff -urN linux-4.9.37/drivers/mtd/Makefile linux-4.9.y/drivers/mtd/Makefile -obj-$(CONFIG_MTD_SPI_NOR) += spi-nor/ obj-$(CONFIG_MTD_UBI) += ubi/ -diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100.c linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc100.c --- linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc100.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,1199 @@ @@ -49278,7 +49075,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100.c linux-4.9.y/drivers/mt +} +#endif + -diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100.h linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc100.h --- linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc100.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,375 @@ @@ -49657,7 +49453,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100.h linux-4.9.y/drivers/mt +#endif + +#endif /* End of __FMC100_H__ */ -diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100_os.c linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc100_os.c --- linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100_os.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc100_os.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,223 @@ @@ -49884,7 +49679,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100_os.c linux-4.9.y/drivers + +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("Goke Flash Memory Controller V100 SPI Nand Driver"); -diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100_spi_general.c linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc100_spi_general.c --- linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100_spi_general.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc100_spi_general.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,246 @@ @@ -50134,7 +49928,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc100_spi_general.c linux-4.9. + + return op; +} -diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc_spi_nand_ids.c linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc_spi_nand_ids.c --- linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc_spi_nand_ids.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/gkfmc100/fmc_spi_nand_ids.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,2270 @@ @@ -52408,7 +52201,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/fmc_spi_nand_ids.c linux-4.9.y/ +} +/*****************************************************************************/ +#endif /* CONFIG_PM */ -diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/Kconfig linux-4.9.y/drivers/mtd/nand/gkfmc100/Kconfig --- linux-4.9.37/drivers/mtd/nand/gkfmc100/Kconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/gkfmc100/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,17 @@ @@ -52429,7 +52221,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/Kconfig linux-4.9.y/drivers/mtd + Goke Flash Memory Controller version 100 is called fmc100 for + short. The controller driver support registers and DMA transfers + while reading or writing the SPI nand flash. -diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/Makefile linux-4.9.y/drivers/mtd/nand/gkfmc100/Makefile --- linux-4.9.37/drivers/mtd/nand/gkfmc100/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/gkfmc100/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,26 @@ @@ -52459,7 +52250,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/gkfmc100/Makefile linux-4.9.y/drivers/mt + +obj-y += fmc_spi_nand_ids.o +obj-y += fmc100.o fmc100_os.o -diff -urN linux-4.9.37/drivers/mtd/nand/Kconfig linux-4.9.y/drivers/mtd/nand/Kconfig --- linux-4.9.37/drivers/mtd/nand/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -569,4 +569,28 @@ @@ -52491,7 +52281,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/Kconfig linux-4.9.y/drivers/mtd/nand/Kco +source "drivers/mtd/nand/gkfmc100/Kconfig" + endif # MTD_NAND -diff -urN linux-4.9.37/drivers/mtd/nand/Makefile linux-4.9.y/drivers/mtd/nand/Makefile --- linux-4.9.37/drivers/mtd/nand/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -8,6 +8,7 @@ @@ -52508,7 +52297,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/Makefile linux-4.9.y/drivers/mtd/nand/Ma -nand-objs := nand_base.o nand_bbt.o nand_timings.o +nand-objs := nand_base.o nand_bbt.o nand_timings.o nfc_gen.o nfc_spl_ids.o match_table.o -diff -urN linux-4.9.37/drivers/mtd/nand/match_table.c linux-4.9.y/drivers/mtd/nand/match_table.c --- linux-4.9.37/drivers/mtd/nand/match_table.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/match_table.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,99 @@ @@ -52611,7 +52399,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/match_table.c linux-4.9.y/drivers/mtd/na + } + return (void *)def; +} -diff -urN linux-4.9.37/drivers/mtd/nand/match_table.h linux-4.9.y/drivers/mtd/nand/match_table.h --- linux-4.9.37/drivers/mtd/nand/match_table.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/match_table.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,53 @@ @@ -52668,7 +52455,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/match_table.h linux-4.9.y/drivers/mtd/na +/*****************************************************************************/ + +#endif /* End of __MATCH_TABLE_H__ */ -diff -urN linux-4.9.37/drivers/mtd/nand/nand_base.c linux-4.9.y/drivers/mtd/nand/nand_base.c --- linux-4.9.37/drivers/mtd/nand/nand_base.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/nand_base.c 2021-06-07 13:01:33.000000000 +0300 @@ -47,6 +47,8 @@ @@ -52780,7 +52566,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/nand_base.c linux-4.9.y/drivers/mtd/nand mtd->flags = (chip->options & NAND_ROM) ? MTD_CAP_ROM : MTD_CAP_NANDFLASH; mtd->_erase = nand_erase; -diff -urN linux-4.9.37/drivers/mtd/nand/nand_ids.c linux-4.9.y/drivers/mtd/nand/nand_ids.c --- linux-4.9.37/drivers/mtd/nand/nand_ids.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/nand_ids.c 2021-06-07 13:01:33.000000000 +0300 @@ -168,7 +168,7 @@ @@ -52810,7 +52595,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/nand_ids.c linux-4.9.y/drivers/mtd/nand/ {0x0, "Unknown"} }; -diff -urN linux-4.9.37/drivers/mtd/nand/nfc_gen.c linux-4.9.y/drivers/mtd/nand/nfc_gen.c --- linux-4.9.37/drivers/mtd/nand/nfc_gen.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/nfc_gen.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,233 @@ @@ -53047,7 +52831,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/nfc_gen.c linux-4.9.y/drivers/mtd/nand/n + return match_type_to_reg(page_type_size_table, + ARRAY_SIZE(page_type_size_table), type, _2K); +} -diff -urN linux-4.9.37/drivers/mtd/nand/nfc_gen.h linux-4.9.y/drivers/mtd/nand/nfc_gen.h --- linux-4.9.37/drivers/mtd/nand/nfc_gen.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/nfc_gen.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,280 @@ @@ -53331,7 +53114,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/nfc_gen.h linux-4.9.y/drivers/mtd/nand/n +/*****************************************************************************/ + +#endif /* End of __NFC_GEN_H__ */ -diff -urN linux-4.9.37/drivers/mtd/nand/nfc_spl_ids.c linux-4.9.y/drivers/mtd/nand/nfc_spl_ids.c --- linux-4.9.37/drivers/mtd/nand/nfc_spl_ids.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/nand/nfc_spl_ids.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,966 @@ @@ -54301,7 +54083,6 @@ diff -urN linux-4.9.37/drivers/mtd/nand/nfc_spl_ids.c linux-4.9.y/drivers/mtd/na + ultohstr(chip->chipsize, buf, sizeof(buf)), + chip->numchips);*/ +} -diff -urN linux-4.9.37/drivers/mtd/spi-nor/goke-sfc.c linux-4.9.y/drivers/mtd/spi-nor/goke-sfc.c --- linux-4.9.37/drivers/mtd/spi-nor/goke-sfc.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/mtd/spi-nor/goke-sfc.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,592 @@ @@ -54897,7 +54678,6 @@ diff -urN linux-4.9.37/drivers/mtd/spi-nor/goke-sfc.c linux-4.9.y/drivers/mtd/sp + +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("Goke SPI Nor Flash Controller Driver"); -diff -urN linux-4.9.37/drivers/mtd/spi-nor/Kconfig linux-4.9.y/drivers/mtd/spi-nor/Kconfig --- linux-4.9.37/drivers/mtd/spi-nor/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mtd/spi-nor/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -65,6 +65,34 @@ @@ -54935,7 +54715,6 @@ diff -urN linux-4.9.37/drivers/mtd/spi-nor/Kconfig linux-4.9.y/drivers/mtd/spi-n config SPI_NXP_SPIFI tristate "NXP SPI Flash Interface (SPIFI)" depends on OF && (ARCH_LPC18XX || COMPILE_TEST) -diff -urN linux-4.9.37/drivers/mtd/spi-nor/Makefile linux-4.9.y/drivers/mtd/spi-nor/Makefile --- linux-4.9.37/drivers/mtd/spi-nor/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mtd/spi-nor/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -2,6 +2,7 @@ @@ -54946,7 +54725,6 @@ diff -urN linux-4.9.37/drivers/mtd/spi-nor/Makefile linux-4.9.y/drivers/mtd/spi- obj-$(CONFIG_SPI_HISI_SFC) += hisi-sfc.o obj-$(CONFIG_MTD_MT81xx_NOR) += mtk-quadspi.o obj-$(CONFIG_SPI_NXP_SPIFI) += nxp-spifi.o -diff -urN linux-4.9.37/drivers/mtd/spi-nor/spi-nor.c linux-4.9.y/drivers/mtd/spi-nor/spi-nor.c --- linux-4.9.37/drivers/mtd/spi-nor/spi-nor.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/mtd/spi-nor/spi-nor.c 2021-06-07 13:01:33.000000000 +0300 @@ -75,6 +75,13 @@ @@ -56931,7 +56709,6 @@ diff -urN linux-4.9.37/drivers/mtd/spi-nor/spi-nor.c linux-4.9.y/drivers/mtd/spi MODULE_LICENSE("GPL"); MODULE_AUTHOR("Huang Shijie "); MODULE_AUTHOR("Mike Lavender"); -diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/femac.c linux-4.9.y/drivers/net/ethernet/goke/femac/femac.c --- linux-4.9.37/drivers/net/ethernet/goke/femac/femac.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/femac/femac.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,1560 @@ @@ -58495,7 +58272,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/femac.c linux-4.9.y/drive +MODULE_AUTHOR("Goke"); +MODULE_LICENSE("GPL v2"); +MODULE_ALIAS("platform:femac"); -diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/femac.h linux-4.9.y/drivers/net/ethernet/goke/femac/femac.h --- linux-4.9.37/drivers/net/ethernet/goke/femac/femac.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/femac/femac.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,262 @@ @@ -58761,7 +58537,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/femac.h linux-4.9.y/drive +}; + +#endif -diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/Makefile linux-4.9.y/drivers/net/ethernet/goke/femac/Makefile --- linux-4.9.37/drivers/net/ethernet/goke/femac/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/femac/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,5 @@ @@ -58770,7 +58545,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/Makefile linux-4.9.y/driv +# + +obj-$(CONFIG_GOKE_FEMAC) += femac.o phy_fix.o util.o -diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/phy_fix.c linux-4.9.y/drivers/net/ethernet/goke/femac/phy_fix.c --- linux-4.9.37/drivers/net/ethernet/goke/femac/phy_fix.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/femac/phy_fix.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,83 @@ @@ -58857,7 +58631,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/phy_fix.c linux-4.9.y/dri + phy_unregister_fixup_for_uid(GOKE_PHY_ID_V115, + GOKE_PHY_MASK); +} -diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/phy_fix.h linux-4.9.y/drivers/net/ethernet/goke/femac/phy_fix.h --- linux-4.9.37/drivers/net/ethernet/goke/femac/phy_fix.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/femac/phy_fix.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,18 @@ @@ -58879,7 +58652,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/phy_fix.h linux-4.9.y/dri +void phy_unregister_fixups(void); + +#endif -diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/phy_v1.h linux-4.9.y/drivers/net/ethernet/goke/femac/phy_v1.h --- linux-4.9.37/drivers/net/ethernet/goke/femac/phy_v1.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/femac/phy_v1.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,188 @@ @@ -59072,7 +58844,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/phy_v1.h linux-4.9.y/driv + 0x3618, 0x00, 0x3400, 0x01, 0x33f8, 0x01 +#endif \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/phy_v2.h linux-4.9.y/drivers/net/ethernet/goke/femac/phy_v2.h --- linux-4.9.37/drivers/net/ethernet/goke/femac/phy_v2.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/femac/phy_v2.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,41 @@ @@ -59118,7 +58889,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/phy_v2.h linux-4.9.y/driv + 0x345F, 0x39, 0x3400, 0x01, 0x33f8, 0x01 +#endif \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/util.c linux-4.9.y/drivers/net/ethernet/goke/femac/util.c --- linux-4.9.37/drivers/net/ethernet/goke/femac/util.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/femac/util.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,292 @@ @@ -59415,7 +59185,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/util.c linux-4.9.y/driver + return 0; +} \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/util.h linux-4.9.y/drivers/net/ethernet/goke/femac/util.h --- linux-4.9.37/drivers/net/ethernet/goke/femac/util.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/femac/util.h 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,22 @@ @@ -59442,7 +59211,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/femac/util.h linux-4.9.y/driver + +#endif \ В конце файла нет новой строки -diff -urN linux-4.9.37/drivers/net/ethernet/goke/Kconfig linux-4.9.y/drivers/net/ethernet/goke/Kconfig --- linux-4.9.37/drivers/net/ethernet/goke/Kconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,32 @@ @@ -59478,7 +59246,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/Kconfig linux-4.9.y/drivers/net + the energy efficient Ethernet (EEE). + +endif # NET_VENDOR_GOKE -diff -urN linux-4.9.37/drivers/net/ethernet/goke/Makefile linux-4.9.y/drivers/net/ethernet/goke/Makefile --- linux-4.9.37/drivers/net/ethernet/goke/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/goke/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,5 @@ @@ -59487,7 +59254,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/goke/Makefile linux-4.9.y/drivers/ne +# + +obj-$(CONFIG_GOKE_FEMAC) += femac/ -diff -urN linux-4.9.37/drivers/net/ethernet/Kconfig linux-4.9.y/drivers/net/ethernet/Kconfig --- linux-4.9.37/drivers/net/ethernet/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -75,6 +75,7 @@ @@ -59498,7 +59264,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/Kconfig linux-4.9.y/drivers/net/ethe source "drivers/net/ethernet/hp/Kconfig" source "drivers/net/ethernet/ibm/Kconfig" source "drivers/net/ethernet/intel/Kconfig" -diff -urN linux-4.9.37/drivers/net/ethernet/Makefile linux-4.9.y/drivers/net/ethernet/Makefile --- linux-4.9.37/drivers/net/ethernet/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/net/ethernet/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -38,6 +38,7 @@ @@ -59509,7 +59274,6 @@ diff -urN linux-4.9.37/drivers/net/ethernet/Makefile linux-4.9.y/drivers/net/eth obj-$(CONFIG_NET_VENDOR_HP) += hp/ obj-$(CONFIG_NET_VENDOR_IBM) += ibm/ obj-$(CONFIG_NET_VENDOR_INTEL) += intel/ -diff -urN linux-4.9.37/drivers/net/phy/Kconfig linux-4.9.y/drivers/net/phy/Kconfig --- linux-4.9.37/drivers/net/phy/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/net/phy/Kconfig 2021-06-07 13:01:33.000000000 +0300 @@ -89,6 +89,13 @@ @@ -59526,7 +59290,6 @@ diff -urN linux-4.9.37/drivers/net/phy/Kconfig linux-4.9.y/drivers/net/phy/Kconf config MDIO_GPIO tristate "GPIO lib-based bitbanged MDIO buses" depends on MDIO_BITBANG && GPIOLIB -diff -urN linux-4.9.37/drivers/net/phy/Makefile linux-4.9.y/drivers/net/phy/Makefile --- linux-4.9.37/drivers/net/phy/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/net/phy/Makefile 2021-06-07 13:01:33.000000000 +0300 @@ -13,6 +13,7 @@ @@ -59537,7 +59300,6 @@ diff -urN linux-4.9.37/drivers/net/phy/Makefile linux-4.9.y/drivers/net/phy/Make obj-$(CONFIG_MDIO_GPIO) += mdio-gpio.o obj-$(CONFIG_MDIO_HISI_FEMAC) += mdio-hisi-femac.o obj-$(CONFIG_MDIO_MOXART) += mdio-moxart.o -diff -urN linux-4.9.37/drivers/net/phy/mdio-goke-femac.c linux-4.9.y/drivers/net/phy/mdio-goke-femac.c --- linux-4.9.37/drivers/net/phy/mdio-goke-femac.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/net/phy/mdio-goke-femac.c 2021-06-07 13:01:33.000000000 +0300 @@ -0,0 +1,450 @@ @@ -59991,7 +59753,6 @@ diff -urN linux-4.9.37/drivers/net/phy/mdio-goke-femac.c linux-4.9.y/drivers/net + +MODULE_DESCRIPTION("Goke Fast Ethernet MAC MDIO interface driver"); +MODULE_LICENSE("GPL v2"); -diff -urN linux-4.9.37/drivers/net/phy/phy_device.c linux-4.9.y/drivers/net/phy/phy_device.c --- linux-4.9.37/drivers/net/phy/phy_device.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/net/phy/phy_device.c 2021-06-07 13:01:33.000000000 +0300 @@ -234,6 +234,53 @@ @@ -60048,7 +59809,6 @@ diff -urN linux-4.9.37/drivers/net/phy/phy_device.c linux-4.9.y/drivers/net/phy/ /* Returns 1 if fixup matches phydev in bus_id and phy_uid. * Fixups can be set to match any in one or more fields. */ -diff -urN linux-4.9.37/drivers/net/usb/cdc_ether.c linux-4.9.y/drivers/net/usb/cdc_ether.c --- linux-4.9.37/drivers/net/usb/cdc_ether.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/net/usb/cdc_ether.c 2021-06-07 13:01:33.000000000 +0300 @@ -310,6 +310,26 @@ @@ -60104,18 +59864,15 @@ diff -urN linux-4.9.37/drivers/net/usb/cdc_ether.c linux-4.9.y/drivers/net/usb/c if (status < 0) return status; -diff -urN linux-4.9.37/drivers/net/wan/.gitignore linux-4.9.y/drivers/net/wan/.gitignore --- linux-4.9.37/drivers/net/wan/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/net/wan/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -wanxlfw.inc -diff -urN linux-4.9.37/drivers/of/unittest-data/.gitignore linux-4.9.y/drivers/of/unittest-data/.gitignore --- linux-4.9.37/drivers/of/unittest-data/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/of/unittest-data/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -testcases.dtb -testcases.dtb.S -diff -urN linux-4.9.37/drivers/phy/goke/Kconfig linux-4.9.y/drivers/phy/goke/Kconfig --- linux-4.9.37/drivers/phy/goke/Kconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/phy/goke/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,26 @@ @@ -60145,12 +59902,10 @@ diff -urN linux-4.9.37/drivers/phy/goke/Kconfig linux-4.9.y/drivers/phy/goke/Kco + Select whether the USB drd0 is working in device mode. + +endif # USB_MODE_OPTION -diff -urN linux-4.9.37/drivers/phy/goke/Makefile linux-4.9.y/drivers/phy/goke/Makefile --- linux-4.9.37/drivers/phy/goke/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/phy/goke/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1 @@ +obj-$(CONFIG_PHY_GOKE_USBP2) += phy-goke-usbp2.o -diff -urN linux-4.9.37/drivers/phy/goke/phy-goke-usb.h linux-4.9.y/drivers/phy/goke/phy-goke-usb.h --- linux-4.9.37/drivers/phy/goke/phy-goke-usb.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/phy/goke/phy-goke-usb.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,58 @@ @@ -60212,7 +59967,6 @@ diff -urN linux-4.9.37/drivers/phy/goke/phy-goke-usb.h linux-4.9.y/drivers/phy/g +#define PHY_REGBASE_NODE_IDX 3 + +#endif /* USB2_INCLUDE_PHY_H */ -diff -urN linux-4.9.37/drivers/phy/goke/phy-goke-usbp2.c linux-4.9.y/drivers/phy/goke/phy-goke-usbp2.c --- linux-4.9.37/drivers/phy/goke/phy-goke-usbp2.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/phy/goke/phy-goke-usbp2.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,758 @@ @@ -60974,7 +60728,6 @@ diff -urN linux-4.9.37/drivers/phy/goke/phy-goke-usbp2.c linux-4.9.y/drivers/phy +MODULE_DESCRIPTION("GOKE USB PHY driver"); +MODULE_ALIAS("platform:usbp2-phy"); +MODULE_LICENSE("GPL v2"); -diff -urN linux-4.9.37/drivers/phy/Kconfig linux-4.9.y/drivers/phy/Kconfig --- linux-4.9.37/drivers/phy/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/phy/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -481,6 +481,7 @@ @@ -60985,7 +60738,6 @@ diff -urN linux-4.9.37/drivers/phy/Kconfig linux-4.9.y/drivers/phy/Kconfig config PHY_NS2_PCIE tristate "Broadcom Northstar2 PCIe PHY driver" -diff -urN linux-4.9.37/drivers/phy/Makefile linux-4.9.y/drivers/phy/Makefile --- linux-4.9.37/drivers/phy/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/phy/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -59,4 +59,5 @@ @@ -60994,7 +60746,6 @@ diff -urN linux-4.9.37/drivers/phy/Makefile linux-4.9.y/drivers/phy/Makefile obj-$(CONFIG_ARCH_TEGRA) += tegra/ +obj-$(CONFIG_ARCH_GOKE) += goke/ obj-$(CONFIG_PHY_NS2_PCIE) += phy-bcm-ns2-pcie.o -diff -urN linux-4.9.37/drivers/power/reset/goke-reboot.c linux-4.9.y/drivers/power/reset/goke-reboot.c --- linux-4.9.37/drivers/power/reset/goke-reboot.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/power/reset/goke-reboot.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,73 @@ @@ -61071,7 +60822,6 @@ diff -urN linux-4.9.37/drivers/power/reset/goke-reboot.c linux-4.9.y/drivers/pow + }, +}; +module_platform_driver(bsp_reboot_driver); -diff -urN linux-4.9.37/drivers/power/reset/Kconfig linux-4.9.y/drivers/power/reset/Kconfig --- linux-4.9.37/drivers/power/reset/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/power/reset/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -67,6 +67,12 @@ @@ -61087,7 +60837,6 @@ diff -urN linux-4.9.37/drivers/power/reset/Kconfig linux-4.9.y/drivers/power/res config POWER_RESET_GPIO bool "GPIO power-off driver" depends on OF_GPIO -diff -urN linux-4.9.37/drivers/power/reset/Makefile linux-4.9.y/drivers/power/reset/Makefile --- linux-4.9.37/drivers/power/reset/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/power/reset/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -5,6 +5,7 @@ @@ -61098,7 +60847,6 @@ diff -urN linux-4.9.37/drivers/power/reset/Makefile linux-4.9.y/drivers/power/re obj-$(CONFIG_POWER_RESET_GPIO) += gpio-poweroff.o obj-$(CONFIG_POWER_RESET_GPIO_RESTART) += gpio-restart.o obj-$(CONFIG_POWER_RESET_HISI) += hisi-reboot.o -diff -urN linux-4.9.37/drivers/pwm/Kconfig linux-4.9.y/drivers/pwm/Kconfig --- linux-4.9.37/drivers/pwm/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/pwm/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -175,6 +175,14 @@ @@ -61116,7 +60864,6 @@ diff -urN linux-4.9.37/drivers/pwm/Kconfig linux-4.9.y/drivers/pwm/Kconfig config PWM_IMG tristate "Imagination Technologies PWM driver" depends on HAS_IOMEM -diff -urN linux-4.9.37/drivers/pwm/Makefile linux-4.9.y/drivers/pwm/Makefile --- linux-4.9.37/drivers/pwm/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/pwm/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -15,6 +15,7 @@ @@ -61127,7 +60874,6 @@ diff -urN linux-4.9.37/drivers/pwm/Makefile linux-4.9.y/drivers/pwm/Makefile obj-$(CONFIG_PWM_IMG) += pwm-img.o obj-$(CONFIG_PWM_IMX) += pwm-imx.o obj-$(CONFIG_PWM_JZ4740) += pwm-jz4740.o -diff -urN linux-4.9.37/drivers/pwm/pwm-goke.c linux-4.9.y/drivers/pwm/pwm-goke.c --- linux-4.9.37/drivers/pwm/pwm-goke.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/pwm/pwm-goke.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,260 @@ @@ -61391,7 +61137,6 @@ diff -urN linux-4.9.37/drivers/pwm/pwm-goke.c linux-4.9.y/drivers/pwm/pwm-goke.c +MODULE_AUTHOR("Goke"); +MODULE_DESCRIPTION("Goke SoCs PWM driver"); +MODULE_LICENSE("GPL"); -diff -urN linux-4.9.37/drivers/rtc/Kconfig linux-4.9.y/drivers/rtc/Kconfig --- linux-4.9.37/drivers/rtc/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/rtc/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -3,7 +3,7 @@ @@ -61418,7 +61163,6 @@ diff -urN linux-4.9.37/drivers/rtc/Kconfig linux-4.9.y/drivers/rtc/Kconfig config RTC_DRV_CMOS tristate "PC-style 'CMOS'" depends on X86 || ARM || M32R || PPC || MIPS || SPARC64 || MN10300 -diff -urN linux-4.9.37/drivers/rtc/Makefile linux-4.9.y/drivers/rtc/Makefile --- linux-4.9.37/drivers/rtc/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/rtc/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -68,6 +68,7 @@ @@ -61429,7 +61173,6 @@ diff -urN linux-4.9.37/drivers/rtc/Makefile linux-4.9.y/drivers/rtc/Makefile obj-$(CONFIG_RTC_DRV_HID_SENSOR_TIME) += rtc-hid-sensor-time.o obj-$(CONFIG_RTC_DRV_HYM8563) += rtc-hym8563.o obj-$(CONFIG_RTC_DRV_IMXDI) += rtc-imxdi.o -diff -urN linux-4.9.37/drivers/rtc/rtc-goke.c linux-4.9.y/drivers/rtc/rtc-goke.c --- linux-4.9.37/drivers/rtc/rtc-goke.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/rtc/rtc-goke.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,586 @@ @@ -62019,7 +61762,6 @@ diff -urN linux-4.9.37/drivers/rtc/rtc-goke.c linux-4.9.y/drivers/rtc/rtc-goke.c +MODULE_DESCRIPTION("Goke RTC driver"); +MODULE_LICENSE("GPL v2"); + -diff -urN linux-4.9.37/drivers/scsi/aic7xxx/.gitignore linux-4.9.y/drivers/scsi/aic7xxx/.gitignore --- linux-4.9.37/drivers/scsi/aic7xxx/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/scsi/aic7xxx/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,6 +0,0 @@ @@ -62029,12 +61771,10 @@ diff -urN linux-4.9.37/drivers/scsi/aic7xxx/.gitignore linux-4.9.y/drivers/scsi/ -aic7xxx_reg.h -aic7xxx_reg_print.c -aic7xxx_seq.h -diff -urN linux-4.9.37/drivers/scsi/.gitignore linux-4.9.y/drivers/scsi/.gitignore --- linux-4.9.37/drivers/scsi/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/scsi/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -53c700_d.h -diff -urN linux-4.9.37/drivers/scsi/scsi_lib.c linux-4.9.y/drivers/scsi/scsi_lib.c --- linux-4.9.37/drivers/scsi/scsi_lib.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/scsi/scsi_lib.c 2021-06-07 13:01:34.000000000 +0300 @@ -1420,7 +1420,7 @@ @@ -62073,7 +61813,6 @@ diff -urN linux-4.9.37/drivers/scsi/scsi_lib.c linux-4.9.y/drivers/scsi/scsi_lib return 0; } -diff -urN linux-4.9.37/drivers/spi/spi.c linux-4.9.y/drivers/spi/spi.c --- linux-4.9.37/drivers/spi/spi.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/spi/spi.c 2021-06-07 13:01:34.000000000 +0300 @@ -323,11 +323,125 @@ @@ -62202,7 +61941,6 @@ diff -urN linux-4.9.37/drivers/spi/spi.c linux-4.9.y/drivers/spi/spi.c }; EXPORT_SYMBOL_GPL(spi_bus_type); -diff -urN linux-4.9.37/drivers/spi/spi-pl022.c linux-4.9.y/drivers/spi/spi-pl022.c --- linux-4.9.37/drivers/spi/spi-pl022.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/spi/spi-pl022.c 2021-06-07 13:01:34.000000000 +0300 @@ -43,6 +43,7 @@ @@ -62584,12 +62322,10 @@ diff -urN linux-4.9.37/drivers/spi/spi-pl022.c linux-4.9.y/drivers/spi/spi-pl022 */ .id = 0x00041022, .mask = 0x000fffff, -diff -urN linux-4.9.37/drivers/staging/greybus/tools/.gitignore linux-4.9.y/drivers/staging/greybus/tools/.gitignore --- linux-4.9.37/drivers/staging/greybus/tools/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/staging/greybus/tools/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -loopback_test -diff -urN linux-4.9.37/drivers/tty/serial/amba-pl011.c linux-4.9.y/drivers/tty/serial/amba-pl011.c --- linux-4.9.37/drivers/tty/serial/amba-pl011.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/tty/serial/amba-pl011.c 2021-06-07 13:01:34.000000000 +0300 @@ -109,12 +109,20 @@ @@ -62637,13 +62373,11 @@ diff -urN linux-4.9.37/drivers/tty/serial/amba-pl011.c linux-4.9.y/drivers/tty/s .device_fc = false, }; struct dma_slave_caps caps; -diff -urN linux-4.9.37/drivers/tty/vt/.gitignore linux-4.9.y/drivers/tty/vt/.gitignore --- linux-4.9.37/drivers/tty/vt/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/tty/vt/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -consolemap_deftbl.c -defkeymap.c -diff -urN linux-4.9.37/drivers/tty/vt/selection.c linux-4.9.y/drivers/tty/vt/selection.c --- linux-4.9.37/drivers/tty/vt/selection.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/tty/vt/selection.c 2021-06-07 13:01:34.000000000 +0300 @@ -13,6 +13,7 @@ @@ -62744,7 +62478,6 @@ diff -urN linux-4.9.37/drivers/tty/vt/selection.c linux-4.9.y/drivers/tty/vt/sel remove_wait_queue(&vc->paste_wait, &wait); __set_current_state(TASK_RUNNING); -diff -urN linux-4.9.37/drivers/usb/core/devices.c linux-4.9.y/drivers/usb/core/devices.c --- linux-4.9.37/drivers/usb/core/devices.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/core/devices.c 2021-06-07 13:01:34.000000000 +0300 @@ -182,14 +182,8 @@ @@ -62764,7 +62497,6 @@ diff -urN linux-4.9.37/drivers/usb/core/devices.c linux-4.9.y/drivers/usb/core/d /* this isn't checking for illegal values */ switch (usb_endpoint_type(desc)) { -diff -urN linux-4.9.37/drivers/usb/core/hub.c linux-4.9.y/drivers/usb/core/hub.c --- linux-4.9.37/drivers/usb/core/hub.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/core/hub.c 2021-06-07 13:01:34.000000000 +0300 @@ -1345,6 +1345,10 @@ @@ -62778,7 +62510,6 @@ diff -urN linux-4.9.37/drivers/usb/core/hub.c linux-4.9.y/drivers/usb/core/hub.c message = "hub doesn't have any ports!"; ret = -ENODEV; goto fail; -diff -urN linux-4.9.37/drivers/usb/core/urb.c linux-4.9.y/drivers/usb/core/urb.c --- linux-4.9.37/drivers/usb/core/urb.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/core/urb.c 2021-06-07 13:01:34.000000000 +0300 @@ -407,11 +407,8 @@ @@ -62795,7 +62526,6 @@ diff -urN linux-4.9.37/drivers/usb/core/urb.c linux-4.9.y/drivers/usb/core/urb.c if (urb->number_of_packets <= 0) return -EINVAL; -diff -urN linux-4.9.37/drivers/usb/dwc3/core.c linux-4.9.y/drivers/usb/dwc3/core.c --- linux-4.9.37/drivers/usb/dwc3/core.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/core.c 2021-06-07 13:01:34.000000000 +0300 @@ -44,11 +44,27 @@ @@ -62934,7 +62664,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/core.c linux-4.9.y/drivers/usb/dwc3/core return 0; } -diff -urN linux-4.9.37/drivers/usb/dwc3/core.h linux-4.9.y/drivers/usb/dwc3/core.h --- linux-4.9.37/drivers/usb/dwc3/core.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/core.h 2021-06-07 13:01:34.000000000 +0300 @@ -35,6 +35,8 @@ @@ -63066,7 +62795,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/core.h linux-4.9.y/drivers/usb/dwc3/core /* power management interface */ #if !IS_ENABLED(CONFIG_USB_DWC3_HOST) int dwc3_gadget_suspend(struct dwc3 *dwc); -diff -urN linux-4.9.37/drivers/usb/dwc3/debugfs.c linux-4.9.y/drivers/usb/dwc3/debugfs.c --- linux-4.9.37/drivers/usb/dwc3/debugfs.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/debugfs.c 2021-06-07 13:01:34.000000000 +0300 @@ -689,30 +689,6 @@ @@ -63113,7 +62841,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/debugfs.c linux-4.9.y/drivers/usb/dwc3/d !!(trb->ctrl & DWC3_TRB_CTRL_IOC), !!(trb->ctrl & DWC3_TRB_CTRL_ISP_IMI), !!(trb->ctrl & DWC3_TRB_CTRL_CSP), -diff -urN linux-4.9.37/drivers/usb/dwc3/debug.h linux-4.9.y/drivers/usb/dwc3/debug.h --- linux-4.9.37/drivers/usb/dwc3/debug.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/debug.h 2021-06-07 13:01:34.000000000 +0300 @@ -125,55 +125,344 @@ @@ -63582,7 +63309,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/debug.h linux-4.9.y/drivers/usb/dwc3/deb #ifdef CONFIG_DEBUG_FS extern void dwc3_debugfs_init(struct dwc3 *); -diff -urN linux-4.9.37/drivers/usb/dwc3/dwc3-goke.c linux-4.9.y/drivers/usb/dwc3/dwc3-goke.c --- linux-4.9.37/drivers/usb/dwc3/dwc3-goke.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/dwc3-goke.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,359 @@ @@ -63945,7 +63671,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/dwc3-goke.c linux-4.9.y/drivers/usb/dwc3 +MODULE_LICENSE("GPL v2"); +MODULE_DESCRIPTION("DesignWare USB3 of Goke"); +MODULE_AUTHOR("Goke Technologies Co., Ltd..>"); -diff -urN linux-4.9.37/drivers/usb/dwc3/dwc3-goke.h linux-4.9.y/drivers/usb/dwc3/dwc3-goke.h --- linux-4.9.37/drivers/usb/dwc3/dwc3-goke.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/dwc3-goke.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,36 @@ @@ -63985,7 +63710,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/dwc3-goke.h linux-4.9.y/drivers/usb/dwc3 +#define U_LEVEL2 200 + +#endif -diff -urN linux-4.9.37/drivers/usb/dwc3/ep0.c linux-4.9.y/drivers/usb/dwc3/ep0.c --- linux-4.9.37/drivers/usb/dwc3/ep0.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/ep0.c 2021-06-07 13:01:34.000000000 +0300 @@ -39,22 +39,6 @@ @@ -64587,7 +64311,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/ep0.c linux-4.9.y/drivers/usb/dwc3/ep0.c switch (event->endpoint_event) { case DWC3_DEPEVT_XFERCOMPLETE: dwc3_ep0_xfer_complete(dwc, event); -diff -urN linux-4.9.37/drivers/usb/dwc3/gadget.c linux-4.9.y/drivers/usb/dwc3/gadget.c --- linux-4.9.37/drivers/usb/dwc3/gadget.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/gadget.c 2021-06-07 13:01:34.000000000 +0300 @@ -35,6 +35,15 @@ @@ -65564,7 +65287,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/gadget.c linux-4.9.y/drivers/usb/dwc3/ga +out: + prev = dwc->udc_connect_status; +} -diff -urN linux-4.9.37/drivers/usb/dwc3/host.c linux-4.9.y/drivers/usb/dwc3/host.c --- linux-4.9.37/drivers/usb/dwc3/host.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/host.c 2021-06-07 13:01:34.000000000 +0300 @@ -21,7 +21,7 @@ @@ -65586,7 +65308,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/host.c linux-4.9.y/drivers/usb/dwc3/host /** * WORKAROUND: dwc3 revisions <=3.00a have a limitation * where Port Disable command doesn't work. -diff -urN linux-4.9.37/drivers/usb/dwc3/io.h linux-4.9.y/drivers/usb/dwc3/io.h --- linux-4.9.37/drivers/usb/dwc3/io.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/io.h 2021-06-07 13:01:34.000000000 +0300 @@ -40,8 +40,7 @@ @@ -65609,7 +65330,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/io.h linux-4.9.y/drivers/usb/dwc3/io.h } #endif /* __DRIVERS_USB_DWC3_IO_H */ -diff -urN linux-4.9.37/drivers/usb/dwc3/Makefile linux-4.9.y/drivers/usb/dwc3/Makefile --- linux-4.9.37/drivers/usb/dwc3/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -1,9 +1,12 @@ @@ -65627,7 +65347,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/Makefile linux-4.9.y/drivers/usb/dwc3/Ma ifneq ($(filter y,$(CONFIG_USB_DWC3_HOST) $(CONFIG_USB_DWC3_DUAL_ROLE)),) dwc3-y += host.o -diff -urN linux-4.9.37/drivers/usb/dwc3/proc.c linux-4.9.y/drivers/usb/dwc3/proc.c --- linux-4.9.37/drivers/usb/dwc3/proc.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/proc.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,120 @@ @@ -65751,7 +65470,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/proc.c linux-4.9.y/drivers/usb/dwc3/proc + + return 0; +} -diff -urN linux-4.9.37/drivers/usb/dwc3/trace.h linux-4.9.y/drivers/usb/dwc3/trace.h --- linux-4.9.37/drivers/usb/dwc3/trace.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/dwc3/trace.h 2021-06-07 13:01:34.000000000 +0300 @@ -27,57 +27,53 @@ @@ -66067,7 +65785,6 @@ diff -urN linux-4.9.37/drivers/usb/dwc3/trace.h linux-4.9.y/drivers/usb/dwc3/tra #endif /* __DWC3_TRACE_H */ /* this part has to be here */ -diff -urN linux-4.9.37/drivers/usb/gadget/composite.c linux-4.9.y/drivers/usb/gadget/composite.c --- linux-4.9.37/drivers/usb/gadget/composite.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/composite.c 2021-06-07 13:01:34.000000000 +0300 @@ -205,7 +205,7 @@ @@ -66104,7 +65821,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/composite.c linux-4.9.y/drivers/usb/ga } list_del(&config->list); if (config->unbind) { -diff -urN linux-4.9.37/drivers/usb/gadget/configfs.c linux-4.9.y/drivers/usb/gadget/configfs.c --- linux-4.9.37/drivers/usb/gadget/configfs.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/configfs.c 2021-06-07 13:01:34.000000000 +0300 @@ -1209,6 +1209,9 @@ @@ -66127,7 +65843,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/configfs.c linux-4.9.y/drivers/usb/gad } c->next_interface_id = 0; memset(c->interface, 0, sizeof(c->interface)); -diff -urN linux-4.9.37/drivers/usb/gadget/epautoconf.c linux-4.9.y/drivers/usb/gadget/epautoconf.c --- linux-4.9.37/drivers/usb/gadget/epautoconf.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/epautoconf.c 2021-06-07 13:01:34.000000000 +0300 @@ -82,9 +82,16 @@ @@ -66150,7 +65865,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/epautoconf.c linux-4.9.y/drivers/usb/g } /* Fail */ -diff -urN linux-4.9.37/drivers/usb/gadget/function/f_hid.c linux-4.9.y/drivers/usb/gadget/function/f_hid.c --- linux-4.9.37/drivers/usb/gadget/function/f_hid.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/f_hid.c 2021-06-07 13:01:34.000000000 +0300 @@ -284,6 +284,7 @@ @@ -66350,7 +66064,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/f_hid.c linux-4.9.y/drivers/u usb_free_all_descriptors(f); } -diff -urN linux-4.9.37/drivers/usb/gadget/function/f_mass_storage.c linux-4.9.y/drivers/usb/gadget/function/f_mass_storage.c --- linux-4.9.37/drivers/usb/gadget/function/f_mass_storage.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/f_mass_storage.c 2021-06-07 13:01:34.000000000 +0300 @@ -301,6 +301,7 @@ @@ -66396,7 +66109,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/f_mass_storage.c linux-4.9.y/ common->running = 1; for (i = 0; i < ARRAY_SIZE(common->luns); ++i) if (common->luns[i]) -diff -urN linux-4.9.37/drivers/usb/gadget/function/f_uac1.c linux-4.9.y/drivers/usb/gadget/function/f_uac1.c --- linux-4.9.37/drivers/usb/gadget/function/f_uac1.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/f_uac1.c 2021-06-07 13:01:34.000000000 +0300 @@ -1,24 +1,34 @@ @@ -67611,7 +67323,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/f_uac1.c linux-4.9.y/drivers/ MODULE_LICENSE("GPL"); -MODULE_AUTHOR("Bryan Wu"); +MODULE_AUTHOR("Ruslan Bilovol"); -diff -urN linux-4.9.37/drivers/usb/gadget/function/f_uac1_legacy.c linux-4.9.y/drivers/usb/gadget/function/f_uac1_legacy.c --- linux-4.9.37/drivers/usb/gadget/function/f_uac1_legacy.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/f_uac1_legacy.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,1020 @@ @@ -68635,7 +68346,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/f_uac1_legacy.c linux-4.9.y/d +DECLARE_USB_FUNCTION_INIT(uac1_legacy, f_audio_alloc_inst, f_audio_alloc); +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("Bryan Wu"); -diff -urN linux-4.9.37/drivers/usb/gadget/function/f_uac2.c linux-4.9.y/drivers/usb/gadget/function/f_uac2.c --- linux-4.9.37/drivers/usb/gadget/function/f_uac2.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/f_uac2.c 2021-06-07 13:01:34.000000000 +0300 @@ -1,30 +1,19 @@ @@ -70034,7 +69744,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/f_uac2.c linux-4.9.y/drivers/ } DECLARE_USB_FUNCTION_INIT(uac2, afunc_alloc_inst, afunc_alloc); -diff -urN linux-4.9.37/drivers/usb/gadget/function/f_uvc.c linux-4.9.y/drivers/usb/gadget/function/f_uvc.c --- linux-4.9.37/drivers/usb/gadget/function/f_uvc.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/f_uvc.c 2021-06-07 13:01:34.000000000 +0300 @@ -594,6 +594,14 @@ @@ -70134,7 +69843,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/f_uvc.c linux-4.9.y/drivers/u uvcg_attach_configfs(opts); return &opts->func_inst; -diff -urN linux-4.9.37/drivers/usb/gadget/function/Makefile linux-4.9.y/drivers/usb/gadget/function/Makefile --- linux-4.9.37/drivers/usb/gadget/function/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -32,8 +32,11 @@ @@ -70150,7 +69858,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/Makefile linux-4.9.y/drivers/ usb_f_uac2-y := f_uac2.o obj-$(CONFIG_USB_F_UAC2) += usb_f_uac2.o usb_f_uvc-y := f_uvc.o uvc_queue.o uvc_v4l2.o uvc_video.o uvc_configfs.o -diff -urN linux-4.9.37/drivers/usb/gadget/function/u_audio.c linux-4.9.y/drivers/usb/gadget/function/u_audio.c --- linux-4.9.37/drivers/usb/gadget/function/u_audio.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/u_audio.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,628 @@ @@ -70782,7 +70489,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/u_audio.c linux-4.9.y/drivers +MODULE_LICENSE("GPL"); +MODULE_DESCRIPTION("USB gadget \"ALSA sound card\" utilities"); +MODULE_AUTHOR("Ruslan Bilovol"); -diff -urN linux-4.9.37/drivers/usb/gadget/function/u_audio.h linux-4.9.y/drivers/usb/gadget/function/u_audio.h --- linux-4.9.37/drivers/usb/gadget/function/u_audio.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/u_audio.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,88 @@ @@ -70874,7 +70580,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/u_audio.h linux-4.9.y/drivers +void u_audio_stop_playback(struct g_audio *g_audio); + +#endif /* __U_AUDIO_H */ -diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac1.c linux-4.9.y/drivers/usb/gadget/function/u_uac1.c --- linux-4.9.37/drivers/usb/gadget/function/u_uac1.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/u_uac1.c 2021-06-07 13:01:34.000000000 +0300 @@ -157,7 +157,6 @@ @@ -70902,7 +70607,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac1.c linux-4.9.y/drivers/ return 0; } -diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac1.h linux-4.9.y/drivers/usb/gadget/function/u_uac1.h --- linux-4.9.37/drivers/usb/gadget/function/u_uac1.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/u_uac1.h 2021-06-07 13:01:34.000000000 +0300 @@ -1,82 +1,38 @@ @@ -71009,7 +70713,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac1.h linux-4.9.y/drivers/ - -#endif /* __U_AUDIO_H */ +#endif /* __U_UAC1_H */ -diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac1_legacy.c linux-4.9.y/drivers/usb/gadget/function/u_uac1_legacy.c --- linux-4.9.37/drivers/usb/gadget/function/u_uac1_legacy.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/u_uac1_legacy.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,315 @@ @@ -71328,7 +71031,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac1_legacy.c linux-4.9.y/d + gaudio_close_snd_dev(the_card); +} + -diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac1_legacy.h linux-4.9.y/drivers/usb/gadget/function/u_uac1_legacy.h --- linux-4.9.37/drivers/usb/gadget/function/u_uac1_legacy.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/u_uac1_legacy.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,82 @@ @@ -71414,7 +71116,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac1_legacy.h linux-4.9.y/d +int u_audio_get_playback_rate(struct gaudio *card); + +#endif /* __U_UAC1_LEGACY_H */ -diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac2.h linux-4.9.y/drivers/usb/gadget/function/u_uac2.h --- linux-4.9.37/drivers/usb/gadget/function/u_uac2.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/u_uac2.h 2021-06-07 13:01:34.000000000 +0300 @@ -1,3 +1,4 @@ @@ -71449,7 +71150,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uac2.h linux-4.9.y/drivers/ bool bound; struct mutex lock; -diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uvc.h linux-4.9.y/drivers/usb/gadget/function/u_uvc.h --- linux-4.9.37/drivers/usb/gadget/function/u_uvc.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/u_uvc.h 2021-06-07 13:01:34.000000000 +0300 @@ -52,6 +52,7 @@ @@ -71471,7 +71171,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/u_uvc.h linux-4.9.y/drivers/u /* * Streaming descriptors for full-speed, high-speed and super-speed. -diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc_configfs.c linux-4.9.y/drivers/usb/gadget/function/uvc_configfs.c --- linux-4.9.37/drivers/usb/gadget/function/uvc_configfs.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/uvc_configfs.c 2021-06-07 13:01:34.000000000 +0300 @@ -254,7 +254,49 @@ @@ -72314,7 +72013,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc_configfs.c linux-4.9.y/dr configfs_add_default_group(&uvcg_color_matching_grp.group, &uvcg_streaming_grp.group); configfs_add_default_group(&uvcg_streaming_class_grp.group, -diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc.h linux-4.9.y/drivers/usb/gadget/function/uvc.h --- linux-4.9.37/drivers/usb/gadget/function/uvc.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/uvc.h 2021-06-07 13:01:34.000000000 +0300 @@ -17,6 +17,7 @@ @@ -72357,7 +72055,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc.h linux-4.9.y/drivers/usb /* Requests */ unsigned int req_size; struct usb_request *req[UVC_NUM_REQUESTS]; -diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc_v4l2.c linux-4.9.y/drivers/usb/gadget/function/uvc_v4l2.c --- linux-4.9.37/drivers/usb/gadget/function/uvc_v4l2.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/uvc_v4l2.c 2021-06-07 13:01:34.000000000 +0300 @@ -60,8 +60,13 @@ @@ -72374,7 +72071,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc_v4l2.c linux-4.9.y/driver }; static int -diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc_video.c linux-4.9.y/drivers/usb/gadget/function/uvc_video.c --- linux-4.9.37/drivers/usb/gadget/function/uvc_video.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/uvc_video.c 2021-06-07 13:01:34.000000000 +0300 @@ -23,6 +23,8 @@ @@ -72625,7 +72321,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc_video.c linux-4.9.y/drive /* Initialize the video buffers queue. */ uvcg_queue_init(&video->queue, V4L2_BUF_TYPE_VIDEO_OUTPUT, -diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc_video.h linux-4.9.y/drivers/usb/gadget/function/uvc_video.h --- linux-4.9.37/drivers/usb/gadget/function/uvc_video.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/function/uvc_video.h 2021-06-07 13:01:34.000000000 +0300 @@ -19,6 +19,6 @@ @@ -72636,7 +72331,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/function/uvc_video.h linux-4.9.y/drive +int uvcg_video_init(struct uvc_video *video, struct uvc_device *uvc); #endif /* __UVC_VIDEO_H__ */ -diff -urN linux-4.9.37/drivers/usb/gadget/Kconfig linux-4.9.y/drivers/usb/gadget/Kconfig --- linux-4.9.37/drivers/usb/gadget/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -158,6 +158,9 @@ @@ -72657,7 +72351,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/Kconfig linux-4.9.y/drivers/usb/gadget select USB_F_UAC2 help This Audio function is compatible with USB Audio Class -diff -urN linux-4.9.37/drivers/usb/gadget/legacy/audio.c linux-4.9.y/drivers/usb/gadget/legacy/audio.c --- linux-4.9.37/drivers/usb/gadget/legacy/audio.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/legacy/audio.c 2021-06-07 13:01:34.000000000 +0300 @@ -229,6 +229,7 @@ @@ -72668,7 +72361,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/legacy/audio.c linux-4.9.y/drivers/usb #else uac1_opts = container_of(fi_uac1, struct f_uac1_opts, func_inst); uac1_opts->fn_play = fn_play; -diff -urN linux-4.9.37/drivers/usb/gadget/legacy/Kconfig linux-4.9.y/drivers/usb/gadget/legacy/Kconfig --- linux-4.9.37/drivers/usb/gadget/legacy/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/legacy/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -56,6 +56,7 @@ @@ -72679,7 +72371,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/legacy/Kconfig linux-4.9.y/drivers/usb help This Gadget Audio driver is compatible with USB Audio Class specification 2.0. It implements 1 AudioControl interface, -diff -urN linux-4.9.37/drivers/usb/gadget/legacy/multi.c linux-4.9.y/drivers/usb/gadget/legacy/multi.c --- linux-4.9.37/drivers/usb/gadget/legacy/multi.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/legacy/multi.c 2021-06-07 13:01:34.000000000 +0300 @@ -162,21 +162,8 @@ @@ -72779,7 +72470,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/legacy/multi.c linux-4.9.y/drivers/usb fail0: #ifdef USB_ETH_RNDIS usb_put_function_instance(fi_rndis); -diff -urN linux-4.9.37/drivers/usb/gadget/legacy/webcam.c linux-4.9.y/drivers/usb/gadget/legacy/webcam.c --- linux-4.9.37/drivers/usb/gadget/legacy/webcam.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/legacy/webcam.c 2021-06-07 13:01:34.000000000 +0300 @@ -26,11 +26,11 @@ @@ -73271,7 +72961,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/legacy/webcam.c linux-4.9.y/drivers/us (const struct uvc_descriptor_header *) &uvc_color_matching, NULL, }; -diff -urN linux-4.9.37/drivers/usb/gadget/udc/core.c linux-4.9.y/drivers/usb/gadget/udc/core.c --- linux-4.9.37/drivers/usb/gadget/udc/core.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/udc/core.c 2021-06-07 13:01:34.000000000 +0300 @@ -966,15 +966,6 @@ @@ -73356,7 +73045,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/udc/core.c linux-4.9.y/drivers/usb/gad /** * usb_add_gadget_udc_release - adds a new gadget to the udc class driver list * @parent: the parent device to this udc. Usually the controller driver's -diff -urN linux-4.9.37/drivers/usb/gadget/udc/trace.h linux-4.9.y/drivers/usb/gadget/udc/trace.h --- linux-4.9.37/drivers/usb/gadget/udc/trace.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/gadget/udc/trace.h 2021-06-07 13:01:34.000000000 +0300 @@ -236,6 +236,7 @@ @@ -73380,7 +73068,6 @@ diff -urN linux-4.9.37/drivers/usb/gadget/udc/trace.h linux-4.9.y/drivers/usb/ga __entry->num_mapped_sgs, __entry->num_sgs, __entry->stream_id, __entry->zero ? "Z" : "z", __entry->short_not_ok ? "S" : "s", -diff -urN linux-4.9.37/drivers/usb/host/xhci.c linux-4.9.y/drivers/usb/host/xhci.c --- linux-4.9.37/drivers/usb/host/xhci.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/host/xhci.c 2021-06-07 13:01:34.000000000 +0300 @@ -4131,7 +4131,7 @@ @@ -73392,7 +73079,6 @@ diff -urN linux-4.9.37/drivers/usb/host/xhci.c linux-4.9.y/drivers/usb/host/xhci /* Host supports BESL timeout instead of HIRD */ if (udev->usb2_hw_lpm_besl_capable) { /* if device doesn't have a preferred BESL value use a -diff -urN linux-4.9.37/drivers/usb/host/xhci.h linux-4.9.y/drivers/usb/host/xhci.h --- linux-4.9.37/drivers/usb/host/xhci.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/host/xhci.h 2021-06-07 13:01:34.000000000 +0300 @@ -1661,6 +1661,7 @@ @@ -73403,7 +73089,6 @@ diff -urN linux-4.9.37/drivers/usb/host/xhci.h linux-4.9.y/drivers/usb/host/xhci unsigned int num_active_eps; unsigned int limit_active_eps; -diff -urN linux-4.9.37/drivers/usb/host/xhci-hub.c linux-4.9.y/drivers/usb/host/xhci-hub.c --- linux-4.9.37/drivers/usb/host/xhci-hub.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/host/xhci-hub.c 2021-06-07 13:01:34.000000000 +0300 @@ -1049,13 +1049,15 @@ @@ -73429,7 +73114,6 @@ diff -urN linux-4.9.37/drivers/usb/host/xhci-hub.c linux-4.9.y/drivers/usb/host/ goto error; } -diff -urN linux-4.9.37/drivers/usb/host/xhci-mem.c linux-4.9.y/drivers/usb/host/xhci-mem.c --- linux-4.9.37/drivers/usb/host/xhci-mem.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/host/xhci-mem.c 2021-06-07 13:01:34.000000000 +0300 @@ -1404,7 +1404,7 @@ @@ -73453,7 +73137,6 @@ diff -urN linux-4.9.37/drivers/usb/host/xhci-mem.c linux-4.9.y/drivers/usb/host/ } /* Set up an endpoint with one ring segment. Do not allocate stream rings. -diff -urN linux-4.9.37/drivers/usb/host/xhci-plat.c linux-4.9.y/drivers/usb/host/xhci-plat.c --- linux-4.9.37/drivers/usb/host/xhci-plat.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/host/xhci-plat.c 2021-06-07 13:01:34.000000000 +0300 @@ -220,6 +220,9 @@ @@ -73466,7 +73149,6 @@ diff -urN linux-4.9.37/drivers/usb/host/xhci-plat.c linux-4.9.y/drivers/usb/host if (device_property_read_bool(&pdev->dev, "usb3-lpm-capable")) xhci->quirks |= XHCI_LPM_SUPPORT; -diff -urN linux-4.9.37/drivers/usb/Makefile linux-4.9.y/drivers/usb/Makefile --- linux-4.9.37/drivers/usb/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/usb/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -7,7 +7,7 @@ @@ -73478,7 +73160,6 @@ diff -urN linux-4.9.37/drivers/usb/Makefile linux-4.9.y/drivers/usb/Makefile obj-$(CONFIG_USB_DWC2) += dwc2/ obj-$(CONFIG_USB_ISP1760) += isp1760/ -diff -urN linux-4.9.37/drivers/video/fbdev/core/fbmem.c linux-4.9.y/drivers/video/fbdev/core/fbmem.c --- linux-4.9.37/drivers/video/fbdev/core/fbmem.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/video/fbdev/core/fbmem.c 2021-06-07 13:01:34.000000000 +0300 @@ -32,6 +32,7 @@ @@ -73548,7 +73229,6 @@ diff -urN linux-4.9.37/drivers/video/fbdev/core/fbmem.c linux-4.9.y/drivers/vide default: if (!lock_fb_info(info)) return -ENODEV; -diff -urN linux-4.9.37/drivers/video/logo/.gitignore linux-4.9.y/drivers/video/logo/.gitignore --- linux-4.9.37/drivers/video/logo/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/video/logo/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,7 +0,0 @@ @@ -73559,18 +73239,15 @@ diff -urN linux-4.9.37/drivers/video/logo/.gitignore linux-4.9.y/drivers/video/l -*_vga16.c -*_clut224.c -*_gray256.c -diff -urN linux-4.9.37/drivers/zorro/.gitignore linux-4.9.y/drivers/zorro/.gitignore --- linux-4.9.37/drivers/zorro/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/drivers/zorro/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -devlist.h -gen-devlist -diff -urN linux-4.9.37/firmware/cis/.gitignore linux-4.9.y/firmware/cis/.gitignore --- linux-4.9.37/firmware/cis/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/firmware/cis/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -*.cis -diff -urN linux-4.9.37/firmware/.gitignore linux-4.9.y/firmware/.gitignore --- linux-4.9.37/firmware/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/firmware/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,6 +0,0 @@ @@ -73580,7 +73257,6 @@ diff -urN linux-4.9.37/firmware/.gitignore linux-4.9.y/firmware/.gitignore -*.csp -*.dsp -ihex2fw -diff -urN linux-4.9.37/fs/buffer.c linux-4.9.y/fs/buffer.c --- linux-4.9.37/fs/buffer.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/buffer.c 2021-06-07 13:01:34.000000000 +0300 @@ -1276,10 +1276,17 @@ @@ -73625,7 +73301,6 @@ diff -urN linux-4.9.37/fs/buffer.c linux-4.9.y/fs/buffer.c } /* -diff -urN linux-4.9.37/fs/compat_ioctl.c linux-4.9.y/fs/compat_ioctl.c --- linux-4.9.37/fs/compat_ioctl.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/compat_ioctl.c 2021-06-07 13:01:34.000000000 +0300 @@ -750,9 +750,9 @@ @@ -73640,7 +73315,6 @@ diff -urN linux-4.9.37/fs/compat_ioctl.c linux-4.9.y/fs/compat_ioctl.c return -EFAULT; if (__get_user(datap, &udata->data) || __put_user(compat_ptr(datap), &tdata->data)) -diff -urN linux-4.9.37/fs/dcache.c linux-4.9.y/fs/dcache.c --- linux-4.9.37/fs/dcache.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/dcache.c 2021-06-07 13:01:34.000000000 +0300 @@ -1137,7 +1137,12 @@ @@ -73657,7 +73331,6 @@ diff -urN linux-4.9.37/fs/dcache.c linux-4.9.y/fs/dcache.c } EXPORT_SYMBOL(shrink_dcache_sb); -diff -urN linux-4.9.37/fs/fat/dir.c linux-4.9.y/fs/fat/dir.c --- linux-4.9.37/fs/fat/dir.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/fat/dir.c 2021-06-07 13:01:34.000000000 +0300 @@ -782,6 +782,388 @@ @@ -74061,7 +73734,6 @@ diff -urN linux-4.9.37/fs/fat/dir.c linux-4.9.y/fs/fat/dir.c switch (cmd) { case VFAT_IOCTL_READDIR_SHORT: short_only = 1; -diff -urN linux-4.9.37/fs/fat/fatent.c linux-4.9.y/fs/fat/fatent.c --- linux-4.9.37/fs/fat/fatent.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/fat/fatent.c 2021-06-07 13:01:34.000000000 +0300 @@ -380,6 +380,9 @@ @@ -74074,7 +73746,6 @@ diff -urN linux-4.9.37/fs/fat/fatent.c linux-4.9.y/fs/fat/fatent.c for (copy = 1; copy < sbi->fats; copy++) { sector_t backup_fat = sbi->fat_length * copy; -diff -urN linux-4.9.37/fs/fat/fat.h linux-4.9.y/fs/fat/fat.h --- linux-4.9.37/fs/fat/fat.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/fat/fat.h 2021-06-07 13:01:34.000000000 +0300 @@ -409,6 +409,10 @@ @@ -74088,7 +73759,6 @@ diff -urN linux-4.9.37/fs/fat/fat.h linux-4.9.y/fs/fat/fat.h extern int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs); int fat_cache_init(void); -diff -urN linux-4.9.37/fs/fat/file.c linux-4.9.y/fs/fat/file.c --- linux-4.9.37/fs/fat/file.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/fat/file.c 2021-06-07 13:01:34.000000000 +0300 @@ -167,8 +167,17 @@ @@ -74161,7 +73831,6 @@ diff -urN linux-4.9.37/fs/fat/file.c linux-4.9.y/fs/fat/file.c fat_truncate_blocks(inode, attr->ia_size); up_write(&MSDOS_I(inode)->truncate_lock); } -diff -urN linux-4.9.37/fs/fat/inode.c linux-4.9.y/fs/fat/inode.c --- linux-4.9.37/fs/fat/inode.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/fat/inode.c 2021-06-07 13:01:34.000000000 +0300 @@ -615,8 +615,9 @@ @@ -74286,7 +73955,6 @@ diff -urN linux-4.9.37/fs/fat/inode.c linux-4.9.y/fs/fat/inode.c return err; } -diff -urN linux-4.9.37/fs/fat/misc.c linux-4.9.y/fs/fat/misc.c --- linux-4.9.37/fs/fat/misc.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/fat/misc.c 2021-06-07 13:01:34.000000000 +0300 @@ -261,6 +261,37 @@ @@ -74327,7 +73995,6 @@ diff -urN linux-4.9.37/fs/fat/misc.c linux-4.9.y/fs/fat/misc.c int fat_sync_bhs(struct buffer_head **bhs, int nr_bhs) { -diff -urN linux-4.9.37/fs/jffs2/compr.c linux-4.9.y/fs/jffs2/compr.c --- linux-4.9.37/fs/jffs2/compr.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/jffs2/compr.c 2021-06-07 13:01:34.000000000 +0300 @@ -378,6 +378,9 @@ @@ -74350,7 +74017,6 @@ diff -urN linux-4.9.37/fs/jffs2/compr.c linux-4.9.y/fs/jffs2/compr.c #ifdef CONFIG_JFFS2_LZO jffs2_lzo_exit(); #endif -diff -urN linux-4.9.37/fs/jffs2/compr.h linux-4.9.y/fs/jffs2/compr.h --- linux-4.9.37/fs/jffs2/compr.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/jffs2/compr.h 2021-06-07 13:01:34.000000000 +0300 @@ -29,9 +29,15 @@ @@ -74380,7 +74046,6 @@ diff -urN linux-4.9.37/fs/jffs2/compr.h linux-4.9.y/fs/jffs2/compr.h +#endif #endif /* __JFFS2_COMPR_H__ */ -diff -urN linux-4.9.37/fs/jffs2/compr_lzma.c linux-4.9.y/fs/jffs2/compr_lzma.c --- linux-4.9.37/fs/jffs2/compr_lzma.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/jffs2/compr_lzma.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,125 @@ @@ -74509,7 +74174,6 @@ diff -urN linux-4.9.37/fs/jffs2/compr_lzma.c linux-4.9.y/fs/jffs2/compr_lzma.c + jffs2_unregister_compressor(&jffs2_lzma_comp); + lzma_free_workspace(); +} -diff -urN linux-4.9.37/fs/jffs2/Kconfig linux-4.9.y/fs/jffs2/Kconfig --- linux-4.9.37/fs/jffs2/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/jffs2/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -139,6 +139,15 @@ @@ -74528,7 +74192,6 @@ diff -urN linux-4.9.37/fs/jffs2/Kconfig linux-4.9.y/fs/jffs2/Kconfig config JFFS2_RTIME bool "JFFS2 RTIME compression support" if JFFS2_COMPRESSION_OPTIONS depends on JFFS2_FS -diff -urN linux-4.9.37/fs/jffs2/Makefile linux-4.9.y/fs/jffs2/Makefile --- linux-4.9.37/fs/jffs2/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/jffs2/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -18,4 +18,7 @@ @@ -74539,7 +74202,6 @@ diff -urN linux-4.9.37/fs/jffs2/Makefile linux-4.9.y/fs/jffs2/Makefile jffs2-$(CONFIG_JFFS2_SUMMARY) += summary.o + +CFLAGS_compr_lzma.o += -Iinclude/linux -Ilib/lzma -diff -urN linux-4.9.37/fs/jffs2/super.c linux-4.9.y/fs/jffs2/super.c --- linux-4.9.37/fs/jffs2/super.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/jffs2/super.c 2021-06-07 13:01:34.000000000 +0300 @@ -372,14 +372,41 @@ @@ -74587,7 +74249,6 @@ diff -urN linux-4.9.37/fs/jffs2/super.c linux-4.9.y/fs/jffs2/super.c jffs2_inode_cachep = kmem_cache_create("jffs2_i", sizeof(struct jffs2_inode_info), -diff -urN linux-4.9.37/fs/Kconfig linux-4.9.y/fs/Kconfig --- linux-4.9.37/fs/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -232,6 +232,7 @@ @@ -74598,7 +74259,6 @@ diff -urN linux-4.9.37/fs/Kconfig linux-4.9.y/fs/Kconfig source "fs/jffs2/Kconfig" # UBIFS File system configuration source "fs/ubifs/Kconfig" -diff -urN linux-4.9.37/fs/Makefile linux-4.9.y/fs/Makefile --- linux-4.9.37/fs/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -129,3 +129,4 @@ @@ -74606,7 +74266,6 @@ diff -urN linux-4.9.37/fs/Makefile linux-4.9.y/fs/Makefile obj-$(CONFIG_PSTORE) += pstore/ obj-$(CONFIG_EFIVAR_FS) += efivarfs/ +obj-$(CONFIG_YAFFS_FS) += yaffs2/ -diff -urN linux-4.9.37/fs/xfs/xfs_buf.c linux-4.9.y/fs/xfs/xfs_buf.c --- linux-4.9.37/fs/xfs/xfs_buf.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/xfs/xfs_buf.c 2021-06-07 13:01:34.000000000 +0300 @@ -116,7 +116,7 @@ @@ -74618,7 +74277,6 @@ diff -urN linux-4.9.37/fs/xfs/xfs_buf.c linux-4.9.y/fs/xfs/xfs_buf.c if (bp->b_state & XFS_BSTATE_IN_FLIGHT) { bp->b_state &= ~XFS_BSTATE_IN_FLIGHT; -diff -urN linux-4.9.37/fs/xfs/xfs_icache.c linux-4.9.y/fs/xfs/xfs_icache.c --- linux-4.9.37/fs/xfs/xfs_icache.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/fs/xfs/xfs_icache.c 2021-06-07 13:01:34.000000000 +0300 @@ -66,7 +66,6 @@ @@ -74647,7 +74305,6 @@ diff -urN linux-4.9.37/fs/xfs/xfs_icache.c linux-4.9.y/fs/xfs/xfs_icache.c if (--pag->pag_ici_reclaimable) return; -diff -urN linux-4.9.37/fs/yaffs2/Kconfig linux-4.9.y/fs/yaffs2/Kconfig --- linux-4.9.37/fs/yaffs2/Kconfig 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,171 @@ @@ -74822,7 +74479,6 @@ diff -urN linux-4.9.37/fs/yaffs2/Kconfig linux-4.9.y/fs/yaffs2/Kconfig + help + If this is set then yaffs2 will provide xattr support. + If unsure, say Y. -diff -urN linux-4.9.37/fs/yaffs2/Makefile linux-4.9.y/fs/yaffs2/Makefile --- linux-4.9.37/fs/yaffs2/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,19 @@ @@ -74845,7 +74501,6 @@ diff -urN linux-4.9.37/fs/yaffs2/Makefile linux-4.9.y/fs/yaffs2/Makefile +yaffs-y += yaffs_summary.o +yaffs-y += yaffs_verify.o + -diff -urN linux-4.9.37/fs/yaffs2/yaffs_allocator.c linux-4.9.y/fs/yaffs2/yaffs_allocator.c --- linux-4.9.37/fs/yaffs2/yaffs_allocator.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_allocator.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,357 @@ @@ -75206,7 +74861,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_allocator.c linux-4.9.y/fs/yaffs2/yaffs_a + } +} + -diff -urN linux-4.9.37/fs/yaffs2/yaffs_allocator.h linux-4.9.y/fs/yaffs2/yaffs_allocator.h --- linux-4.9.37/fs/yaffs2/yaffs_allocator.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_allocator.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,30 @@ @@ -75240,7 +74894,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_allocator.h linux-4.9.y/fs/yaffs2/yaffs_a +void yaffs_free_raw_obj(struct yaffs_dev *dev, struct yaffs_obj *obj); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_attribs.c linux-4.9.y/fs/yaffs2/yaffs_attribs.c --- linux-4.9.37/fs/yaffs2/yaffs_attribs.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_attribs.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,136 @@ @@ -75380,7 +75033,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_attribs.c linux-4.9.y/fs/yaffs2/yaffs_att + + return YAFFS_OK; +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_attribs.h linux-4.9.y/fs/yaffs2/yaffs_attribs.h --- linux-4.9.37/fs/yaffs2/yaffs_attribs.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_attribs.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,28 @@ @@ -75412,7 +75064,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_attribs.h linux-4.9.y/fs/yaffs2/yaffs_att +int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_bitmap.c linux-4.9.y/fs/yaffs2/yaffs_bitmap.c --- linux-4.9.37/fs/yaffs2/yaffs_bitmap.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_bitmap.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,99 @@ @@ -75515,7 +75166,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_bitmap.c linux-4.9.y/fs/yaffs2/yaffs_bitm + + return n; +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_bitmap.h linux-4.9.y/fs/yaffs2/yaffs_bitmap.h --- linux-4.9.37/fs/yaffs2/yaffs_bitmap.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_bitmap.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,33 @@ @@ -75552,7 +75202,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_bitmap.h linux-4.9.y/fs/yaffs2/yaffs_bitm +int yaffs_count_chunk_bits(struct yaffs_dev *dev, int blk); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_checkptrw.c linux-4.9.y/fs/yaffs2/yaffs_checkptrw.c --- linux-4.9.37/fs/yaffs2/yaffs_checkptrw.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_checkptrw.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,481 @@ @@ -76037,7 +75686,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_checkptrw.c linux-4.9.y/fs/yaffs2/yaffs_c + + return yaffs_checkpt_erase(dev); +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_checkptrw.h linux-4.9.y/fs/yaffs2/yaffs_checkptrw.h --- linux-4.9.37/fs/yaffs2/yaffs_checkptrw.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_checkptrw.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,33 @@ @@ -76074,7 +75722,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_checkptrw.h linux-4.9.y/fs/yaffs2/yaffs_c +int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_ecc.c linux-4.9.y/fs/yaffs2/yaffs_ecc.c --- linux-4.9.37/fs/yaffs2/yaffs_ecc.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_ecc.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,281 @@ @@ -76359,7 +76006,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_ecc.c linux-4.9.y/fs/yaffs2/yaffs_ecc.c + + return -1; +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_ecc.h linux-4.9.y/fs/yaffs2/yaffs_ecc.h --- linux-4.9.37/fs/yaffs2/yaffs_ecc.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_ecc.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,44 @@ @@ -76407,7 +76053,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_ecc.h linux-4.9.y/fs/yaffs2/yaffs_ecc.h + struct yaffs_ecc_other *read_ecc, + const struct yaffs_ecc_other *test_ecc); +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_endian.c linux-4.9.y/fs/yaffs2/yaffs_endian.c --- linux-4.9.37/fs/yaffs2/yaffs_endian.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_endian.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,106 @@ @@ -76517,7 +76162,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_endian.c linux-4.9.y/fs/yaffs2/yaffs_endi + if (dev->swap_endian) + dev->tn_swap_buffer = kmalloc(dev->tnode_size, GFP_NOFS); +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_endian.h linux-4.9.y/fs/yaffs2/yaffs_endian.h --- linux-4.9.37/fs/yaffs2/yaffs_endian.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_endian.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,55 @@ @@ -76576,7 +76220,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_endian.h linux-4.9.y/fs/yaffs2/yaffs_endi +void yaffs_endian_config(struct yaffs_dev *dev); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_getblockinfo.h linux-4.9.y/fs/yaffs2/yaffs_getblockinfo.h --- linux-4.9.37/fs/yaffs2/yaffs_getblockinfo.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_getblockinfo.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,36 @@ @@ -76616,7 +76259,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_getblockinfo.h linux-4.9.y/fs/yaffs2/yaff +} + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_guts.c linux-4.9.y/fs/yaffs2/yaffs_guts.c --- linux-4.9.37/fs/yaffs2/yaffs_guts.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_guts.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,5215 @@ @@ -81835,7 +81477,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_guts.c linux-4.9.y/fs/yaffs2/yaffs_guts.c + bs[s]++; + } +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_guts.h linux-4.9.y/fs/yaffs2/yaffs_guts.h --- linux-4.9.37/fs/yaffs2/yaffs_guts.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_guts.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,1070 @@ @@ -82909,7 +82550,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_guts.h linux-4.9.y/fs/yaffs2/yaffs_guts.h + + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_linux.h linux-4.9.y/fs/yaffs2/yaffs_linux.h --- linux-4.9.37/fs/yaffs2/yaffs_linux.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_linux.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,48 @@ @@ -82961,7 +82601,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_linux.h linux-4.9.y/fs/yaffs2/yaffs_linux +#endif + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_mtdif.c linux-4.9.y/fs/yaffs2/yaffs_mtdif.c --- linux-4.9.37/fs/yaffs2/yaffs_mtdif.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_mtdif.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,310 @@ @@ -83275,7 +82914,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_mtdif.c linux-4.9.y/fs/yaffs2/yaffs_mtdif + if(mtd) + put_mtd_device(mtd); +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_mtdif.h linux-4.9.y/fs/yaffs2/yaffs_mtdif.h --- linux-4.9.37/fs/yaffs2/yaffs_mtdif.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_mtdif.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,25 @@ @@ -83304,7 +82942,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_mtdif.h linux-4.9.y/fs/yaffs2/yaffs_mtdif +void yaffs_put_mtd_device(struct mtd_info *mtd); +int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags); +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_nameval.c linux-4.9.y/fs/yaffs2/yaffs_nameval.c --- linux-4.9.37/fs/yaffs2/yaffs_nameval.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_nameval.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,230 @@ @@ -83538,7 +83175,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_nameval.c linux-4.9.y/fs/yaffs2/yaffs_nam +{ + return nval_used(dev, xb, xb_size) > 0; +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_nameval.h linux-4.9.y/fs/yaffs2/yaffs_nameval.h --- linux-4.9.37/fs/yaffs2/yaffs_nameval.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_nameval.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,33 @@ @@ -83575,7 +83211,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_nameval.h linux-4.9.y/fs/yaffs2/yaffs_nam + const char *xb, int xb_size, char *buf, int bsize); +int nval_hasvalues(struct yaffs_dev *dev, const char *xb, int xb_size); +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_nand.c linux-4.9.y/fs/yaffs2/yaffs_nand.c --- linux-4.9.37/fs/yaffs2/yaffs_nand.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_nand.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,122 @@ @@ -83701,7 +83336,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_nand.c linux-4.9.y/fs/yaffs2/yaffs_nand.c + return dev->drv.drv_deinitialise_fn(dev); + return YAFFS_OK; +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_nand.h linux-4.9.y/fs/yaffs2/yaffs_nand.h --- linux-4.9.37/fs/yaffs2/yaffs_nand.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_nand.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,39 @@ @@ -83744,7 +83378,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_nand.h linux-4.9.y/fs/yaffs2/yaffs_nand.h +int yaffs_deinit_nand(struct yaffs_dev *dev); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_packedtags1.c linux-4.9.y/fs/yaffs2/yaffs_packedtags1.c --- linux-4.9.37/fs/yaffs2/yaffs_packedtags1.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_packedtags1.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,55 @@ @@ -83803,7 +83436,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_packedtags1.c linux-4.9.y/fs/yaffs2/yaffs + memset(t, 0, sizeof(struct yaffs_ext_tags)); + } +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_packedtags1.h linux-4.9.y/fs/yaffs2/yaffs_packedtags1.h --- linux-4.9.37/fs/yaffs2/yaffs_packedtags1.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_packedtags1.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,39 @@ @@ -83846,7 +83478,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_packedtags1.h linux-4.9.y/fs/yaffs2/yaffs +void yaffs_unpack_tags1(struct yaffs_ext_tags *t, + const struct yaffs_packed_tags1 *pt); +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_packedtags2.c linux-4.9.y/fs/yaffs2/yaffs_packedtags2.c --- linux-4.9.37/fs/yaffs2/yaffs_packedtags2.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_packedtags2.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,208 @@ @@ -84058,7 +83689,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_packedtags2.c linux-4.9.y/fs/yaffs2/yaffs + yaffs_dump_packed_tags2(pt); + yaffs_dump_tags2(t); +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_packedtags2.h linux-4.9.y/fs/yaffs2/yaffs_packedtags2.h --- linux-4.9.37/fs/yaffs2/yaffs_packedtags2.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_packedtags2.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,51 @@ @@ -84113,7 +83743,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_packedtags2.h linux-4.9.y/fs/yaffs2/yaffs + struct yaffs_ext_tags *t, + struct yaffs_packed_tags2_tags_only *pt); +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_summary.c linux-4.9.y/fs/yaffs2/yaffs_summary.c --- linux-4.9.37/fs/yaffs2/yaffs_summary.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_summary.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,310 @@ @@ -84427,7 +84056,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_summary.c linux-4.9.y/fs/yaffs2/yaffs_sum + } + } +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_summary.h linux-4.9.y/fs/yaffs2/yaffs_summary.h --- linux-4.9.37/fs/yaffs2/yaffs_summary.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_summary.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,37 @@ @@ -84468,7 +84096,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_summary.h linux-4.9.y/fs/yaffs2/yaffs_sum + + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_tagscompat.c linux-4.9.y/fs/yaffs2/yaffs_tagscompat.c --- linux-4.9.37/fs/yaffs2/yaffs_tagscompat.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_tagscompat.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,400 @@ @@ -84872,7 +84499,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_tagscompat.c linux-4.9.y/fs/yaffs2/yaffs_ + if(!dev->tagger.mark_bad_fn) + dev->tagger.mark_bad_fn = yaffs_tags_compat_mark_bad; +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_tagscompat.h linux-4.9.y/fs/yaffs2/yaffs_tagscompat.h --- linux-4.9.37/fs/yaffs2/yaffs_tagscompat.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_tagscompat.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,44 @@ @@ -84920,7 +84546,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_tagscompat.h linux-4.9.y/fs/yaffs2/yaffs_ +int yaffs_check_tags_ecc(struct yaffs_tags *tags); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_tagsmarshall.c linux-4.9.y/fs/yaffs2/yaffs_tagsmarshall.c --- linux-4.9.37/fs/yaffs2/yaffs_tagsmarshall.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_tagsmarshall.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,206 @@ @@ -85130,7 +84755,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_tagsmarshall.c linux-4.9.y/fs/yaffs2/yaff + dev->tagger.mark_bad_fn = yaffs_tags_marshall_mark_bad; + +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_tagsmarshall.h linux-4.9.y/fs/yaffs2/yaffs_tagsmarshall.h --- linux-4.9.37/fs/yaffs2/yaffs_tagsmarshall.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_tagsmarshall.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,22 @@ @@ -85156,7 +84780,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_tagsmarshall.h linux-4.9.y/fs/yaffs2/yaff +void yaffs_tags_marshall_install(struct yaffs_dev *dev); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_trace.h linux-4.9.y/fs/yaffs2/yaffs_trace.h --- linux-4.9.37/fs/yaffs2/yaffs_trace.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_trace.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,57 @@ @@ -85217,7 +84840,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_trace.h linux-4.9.y/fs/yaffs2/yaffs_trace +#define YAFFS_TRACE_ALWAYS 0xf0000000 + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_verify.c linux-4.9.y/fs/yaffs2/yaffs_verify.c --- linux-4.9.37/fs/yaffs2/yaffs_verify.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_verify.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,540 @@ @@ -85761,7 +85383,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_verify.c linux-4.9.y/fs/yaffs2/yaffs_veri + (void) in; + return YAFFS_OK; +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_verify.h linux-4.9.y/fs/yaffs2/yaffs_verify.h --- linux-4.9.37/fs/yaffs2/yaffs_verify.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_verify.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,43 @@ @@ -85808,7 +85429,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_verify.h linux-4.9.y/fs/yaffs2/yaffs_veri +int yaffs_skip_verification(struct yaffs_dev *dev); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_vfs.c linux-4.9.y/fs/yaffs2/yaffs_vfs.c --- linux-4.9.37/fs/yaffs2/yaffs_vfs.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_vfs.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,3751 @@ @@ -89563,7 +89183,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_vfs.c linux-4.9.y/fs/yaffs2/yaffs_vfs.c + MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); +MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2011"); +MODULE_LICENSE("GPL"); -diff -urN linux-4.9.37/fs/yaffs2/yaffs_yaffs1.c linux-4.9.y/fs/yaffs2/yaffs_yaffs1.c --- linux-4.9.37/fs/yaffs2/yaffs_yaffs1.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_yaffs1.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,424 @@ @@ -89991,7 +89610,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_yaffs1.c linux-4.9.y/fs/yaffs2/yaffs_yaff + + return YAFFS_OK; +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_yaffs1.h linux-4.9.y/fs/yaffs2/yaffs_yaffs1.h --- linux-4.9.37/fs/yaffs2/yaffs_yaffs1.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_yaffs1.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,22 @@ @@ -90017,7 +89635,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_yaffs1.h linux-4.9.y/fs/yaffs2/yaffs_yaff +int yaffs1_scan(struct yaffs_dev *dev); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yaffs_yaffs2.c linux-4.9.y/fs/yaffs2/yaffs_yaffs2.c --- linux-4.9.37/fs/yaffs2/yaffs_yaffs2.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_yaffs2.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,1712 @@ @@ -91733,7 +91350,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_yaffs2.c linux-4.9.y/fs/yaffs2/yaffs_yaff + + return YAFFS_OK; +} -diff -urN linux-4.9.37/fs/yaffs2/yaffs_yaffs2.h linux-4.9.y/fs/yaffs2/yaffs_yaffs2.h --- linux-4.9.37/fs/yaffs2/yaffs_yaffs2.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yaffs_yaffs2.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,39 @@ @@ -91776,7 +91392,6 @@ diff -urN linux-4.9.37/fs/yaffs2/yaffs_yaffs2.h linux-4.9.y/fs/yaffs2/yaffs_yaff +int yaffs2_scan_backwards(struct yaffs_dev *dev); + +#endif -diff -urN linux-4.9.37/fs/yaffs2/yportenv.h linux-4.9.y/fs/yaffs2/yportenv.h --- linux-4.9.37/fs/yaffs2/yportenv.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/fs/yaffs2/yportenv.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,85 @@ @@ -91865,18 +91480,15 @@ diff -urN linux-4.9.37/fs/yaffs2/yportenv.h linux-4.9.y/fs/yaffs2/yportenv.h + + +#endif -diff -urN linux-4.9.37/.get_maintainer.ignore linux-4.9.y/.get_maintainer.ignore --- linux-4.9.37/.get_maintainer.ignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/.get_maintainer.ignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -Christoph Hellwig -diff -urN linux-4.9.37/.gitattributes linux-4.9.y/.gitattributes --- linux-4.9.37/.gitattributes 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/.gitattributes 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -*.c diff=cpp -*.h diff=cpp -diff -urN linux-4.9.37/.gitignore linux-4.9.y/.gitignore --- linux-4.9.37/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,116 +0,0 @@ @@ -91996,7 +91608,6 @@ diff -urN linux-4.9.37/.gitignore linux-4.9.y/.gitignore - -# Kdevelop4 -*.kdev4 -diff -urN linux-4.9.37/include/dt-bindings/clock/gk7202v300-clock.h linux-4.9.y/include/dt-bindings/clock/gk7202v300-clock.h --- linux-4.9.37/include/dt-bindings/clock/gk7202v300-clock.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/dt-bindings/clock/gk7202v300-clock.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,76 @@ @@ -92076,7 +91687,6 @@ diff -urN linux-4.9.37/include/dt-bindings/clock/gk7202v300-clock.h linux-4.9.y/ +#define GK7202V300_NR_RSTS 256 + +#endif /* __DTS_GK7202V300_CLOCK_H */ -diff -urN linux-4.9.37/include/dt-bindings/clock/gk7205v200-clock.h linux-4.9.y/include/dt-bindings/clock/gk7205v200-clock.h --- linux-4.9.37/include/dt-bindings/clock/gk7205v200-clock.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/dt-bindings/clock/gk7205v200-clock.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,76 @@ @@ -92156,7 +91766,6 @@ diff -urN linux-4.9.37/include/dt-bindings/clock/gk7205v200-clock.h linux-4.9.y/ +#define GK7205V200_NR_RSTS 256 + +#endif /* __DTS_GK7205V200_CLOCK_H */ -diff -urN linux-4.9.37/include/dt-bindings/clock/gk7205v300-clock.h linux-4.9.y/include/dt-bindings/clock/gk7205v300-clock.h --- linux-4.9.37/include/dt-bindings/clock/gk7205v300-clock.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/dt-bindings/clock/gk7205v300-clock.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,76 @@ @@ -92236,7 +91845,6 @@ diff -urN linux-4.9.37/include/dt-bindings/clock/gk7205v300-clock.h linux-4.9.y/ +#define GK7205V300_NR_RSTS 256 + +#endif /* __DTS_GK7205V300_CLOCK_H */ -diff -urN linux-4.9.37/include/dt-bindings/clock/gk7605v100-clock.h linux-4.9.y/include/dt-bindings/clock/gk7605v100-clock.h --- linux-4.9.37/include/dt-bindings/clock/gk7605v100-clock.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/dt-bindings/clock/gk7605v100-clock.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,76 @@ @@ -92316,7 +91924,6 @@ diff -urN linux-4.9.37/include/dt-bindings/clock/gk7605v100-clock.h linux-4.9.y/ +#define GK7605V100_NR_RSTS 256 + +#endif /* __DTS_GK7605V100_CLOCK_H */ -diff -urN linux-4.9.37/include/kvm/arm_psci.h linux-4.9.y/include/kvm/arm_psci.h --- linux-4.9.37/include/kvm/arm_psci.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/kvm/arm_psci.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,29 @@ @@ -92349,7 +91956,6 @@ diff -urN linux-4.9.37/include/kvm/arm_psci.h linux-4.9.y/include/kvm/arm_psci.h +int kvm_psci_call(struct kvm_vcpu *vcpu); + +#endif /* __KVM_ARM_PSCI_H__ */ -diff -urN linux-4.9.37/include/linux/blkdev.h linux-4.9.y/include/linux/blkdev.h --- linux-4.9.37/include/linux/blkdev.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/blkdev.h 2021-06-07 13:01:34.000000000 +0300 @@ -1174,7 +1174,11 @@ @@ -92364,7 +91970,6 @@ diff -urN linux-4.9.37/include/linux/blkdev.h linux-4.9.y/include/linux/blkdev.h BLK_MAX_SEGMENT_SIZE = 65536, BLK_SEG_BOUNDARY_MASK = 0xFFFFFFFFUL, }; -diff -urN linux-4.9.37/include/linux/cpuidle.h linux-4.9.y/include/linux/cpuidle.h --- linux-4.9.37/include/linux/cpuidle.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/cpuidle.h 2021-06-07 13:01:34.000000000 +0300 @@ -62,6 +62,7 @@ @@ -92375,7 +91980,6 @@ diff -urN linux-4.9.37/include/linux/cpuidle.h linux-4.9.y/include/linux/cpuidle #define CPUIDLE_FLAG_COUPLED (0x02) /* state applies to multiple cpus */ #define CPUIDLE_FLAG_TIMER_STOP (0x04) /* timer is stopped on this state */ -diff -urN linux-4.9.37/include/linux/dma-mapping.h linux-4.9.y/include/linux/dma-mapping.h --- linux-4.9.37/include/linux/dma-mapping.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/dma-mapping.h 2021-06-07 13:01:34.000000000 +0300 @@ -705,6 +705,8 @@ @@ -92387,7 +91991,6 @@ diff -urN linux-4.9.37/include/linux/dma-mapping.h linux-4.9.y/include/linux/dma extern void *dmam_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t gfp); extern void dmam_free_coherent(struct device *dev, size_t size, void *vaddr, -diff -urN linux-4.9.37/include/linux/fb.h linux-4.9.y/include/linux/fb.h --- linux-4.9.37/include/linux/fb.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/fb.h 2021-06-07 13:01:34.000000000 +0300 @@ -237,7 +237,14 @@ @@ -92418,7 +92021,6 @@ diff -urN linux-4.9.37/include/linux/fb.h linux-4.9.y/include/linux/fb.h }; #ifdef CONFIG_FB_TILEBLITTING -diff -urN linux-4.9.37/include/linux/fence.h linux-4.9.y/include/linux/fence.h --- linux-4.9.37/include/linux/fence.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/fence.h 2021-06-07 13:01:34.000000000 +0300 @@ -108,6 +108,7 @@ @@ -92509,7 +92111,6 @@ diff -urN linux-4.9.37/include/linux/fence.h linux-4.9.y/include/linux/fence.h } int fence_signal(struct fence *fence); -diff -urN linux-4.9.37/include/linux/fs.h linux-4.9.y/include/linux/fs.h --- linux-4.9.37/include/linux/fs.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/fs.h 2021-06-07 13:01:34.000000000 +0300 @@ -941,9 +941,9 @@ @@ -92524,7 +92125,6 @@ diff -urN linux-4.9.37/include/linux/fs.h linux-4.9.y/include/linux/fs.h #endif #define FL_POSIX 1 -diff -urN linux-4.9.37/include/linux/goke_cma.h linux-4.9.y/include/linux/goke_cma.h --- linux-4.9.37/include/linux/goke_cma.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/linux/goke_cma.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,39 @@ @@ -92567,7 +92167,6 @@ diff -urN linux-4.9.37/include/linux/goke_cma.h linux-4.9.y/include/linux/goke_c +#endif /* CONFIG_CMA */ + +#endif -diff -urN linux-4.9.37/include/linux/i2c.h linux-4.9.y/include/linux/i2c.h --- linux-4.9.37/include/linux/i2c.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/i2c.h 2021-06-07 13:01:34.000000000 +0300 @@ -68,6 +68,20 @@ @@ -92601,7 +92200,6 @@ diff -urN linux-4.9.37/include/linux/i2c.h linux-4.9.y/include/linux/i2c.h int timeout; /* in jiffies */ int retries; -diff -urN linux-4.9.37/include/linux/lzma/LzFind.h linux-4.9.y/include/linux/lzma/LzFind.h --- linux-4.9.37/include/linux/lzma/LzFind.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/linux/lzma/LzFind.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,115 @@ @@ -92720,7 +92318,6 @@ diff -urN linux-4.9.37/include/linux/lzma/LzFind.h linux-4.9.y/include/linux/lzm +#endif + +#endif -diff -urN linux-4.9.37/include/linux/lzma/LzHash.h linux-4.9.y/include/linux/lzma/LzHash.h --- linux-4.9.37/include/linux/lzma/LzHash.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/linux/lzma/LzHash.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,54 @@ @@ -92778,7 +92375,6 @@ diff -urN linux-4.9.37/include/linux/lzma/LzHash.h linux-4.9.y/include/linux/lzm + hash4Value = (temp ^ ((UInt32)cur[2] << 8) ^ (p->crc[cur[3]] << 5)) & (kHash4Size - 1); } + +#endif -diff -urN linux-4.9.37/include/linux/lzma/LzmaDec.h linux-4.9.y/include/linux/lzma/LzmaDec.h --- linux-4.9.37/include/linux/lzma/LzmaDec.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/linux/lzma/LzmaDec.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,231 @@ @@ -93013,7 +92609,6 @@ diff -urN linux-4.9.37/include/linux/lzma/LzmaDec.h linux-4.9.y/include/linux/lz +#endif + +#endif -diff -urN linux-4.9.37/include/linux/lzma/LzmaEnc.h linux-4.9.y/include/linux/lzma/LzmaEnc.h --- linux-4.9.37/include/linux/lzma/LzmaEnc.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/linux/lzma/LzmaEnc.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,80 @@ @@ -93097,7 +92692,6 @@ diff -urN linux-4.9.37/include/linux/lzma/LzmaEnc.h linux-4.9.y/include/linux/lz +#endif + +#endif -diff -urN linux-4.9.37/include/linux/lzma/Types.h linux-4.9.y/include/linux/lzma/Types.h --- linux-4.9.37/include/linux/lzma/Types.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/linux/lzma/Types.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,226 @@ @@ -93327,7 +92921,6 @@ diff -urN linux-4.9.37/include/linux/lzma/Types.h linux-4.9.y/include/linux/lzma +EXTERN_C_END + +#endif -diff -urN linux-4.9.37/include/linux/lzma.h linux-4.9.y/include/linux/lzma.h --- linux-4.9.37/include/linux/lzma.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/linux/lzma.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,62 @@ @@ -93393,7 +92986,6 @@ diff -urN linux-4.9.37/include/linux/lzma.h linux-4.9.y/include/linux/lzma.h +static ISzAlloc lzma_alloc = {p_lzma_malloc, p_lzma_free}; + +#endif -diff -urN linux-4.9.37/include/linux/mfd/goke_fmc.h linux-4.9.y/include/linux/mfd/goke_fmc.h --- linux-4.9.37/include/linux/mfd/goke_fmc.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/linux/mfd/goke_fmc.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,515 @@ @@ -93912,7 +93504,6 @@ diff -urN linux-4.9.37/include/linux/mfd/goke_fmc.h linux-4.9.y/include/linux/mf +extern struct mutex fmc_switch_mutex; + +#endif /*__BSP_FMC_H*/ -diff -urN linux-4.9.37/include/linux/mmc/card.h linux-4.9.y/include/linux/mmc/card.h --- linux-4.9.37/include/linux/mmc/card.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/mmc/card.h 2021-06-07 13:01:34.000000000 +0300 @@ -14,6 +14,8 @@ @@ -94003,7 +93594,6 @@ diff -urN linux-4.9.37/include/linux/mmc/card.h linux-4.9.y/include/linux/mmc/ca #define mmc_card_name(c) ((c)->cid.prod_name) #define mmc_card_id(c) (dev_name(&(c)->dev)) -diff -urN linux-4.9.37/include/linux/mmc/core.h linux-4.9.y/include/linux/mmc/core.h --- linux-4.9.37/include/linux/mmc/core.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/mmc/core.h 2021-06-07 13:01:34.000000000 +0300 @@ -142,10 +142,26 @@ @@ -94051,7 +93641,6 @@ diff -urN linux-4.9.37/include/linux/mmc/core.h linux-4.9.y/include/linux/mmc/co extern int mmc_can_reset(struct mmc_card *card); extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *); -diff -urN linux-4.9.37/include/linux/mmc/host.h linux-4.9.y/include/linux/mmc/host.h --- linux-4.9.37/include/linux/mmc/host.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/mmc/host.h 2021-06-07 13:01:34.000000000 +0300 @@ -82,6 +82,17 @@ @@ -94252,7 +93841,6 @@ diff -urN linux-4.9.37/include/linux/mmc/host.h linux-4.9.y/include/linux/mmc/ho static inline int mmc_card_hs(struct mmc_card *card) { return card->host->ios.timing == MMC_TIMING_SD_HS || -diff -urN linux-4.9.37/include/linux/mmc/mmc.h linux-4.9.y/include/linux/mmc/mmc.h --- linux-4.9.37/include/linux/mmc/mmc.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/mmc/mmc.h 2021-06-07 13:01:34.000000000 +0300 @@ -84,6 +84,11 @@ @@ -94293,7 +93881,6 @@ diff -urN linux-4.9.37/include/linux/mmc/mmc.h linux-4.9.y/include/linux/mmc/mmc /* * MMC_SWITCH access modes -diff -urN linux-4.9.37/include/linux/mm_types.h linux-4.9.y/include/linux/mm_types.h --- linux-4.9.37/include/linux/mm_types.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/mm_types.h 2021-06-07 13:01:34.000000000 +0300 @@ -12,6 +12,7 @@ @@ -94304,7 +93891,6 @@ diff -urN linux-4.9.37/include/linux/mm_types.h linux-4.9.y/include/linux/mm_typ #include #include #include -diff -urN linux-4.9.37/include/linux/mtd/nand.h linux-4.9.y/include/linux/mtd/nand.h --- linux-4.9.37/include/linux/mtd/nand.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/mtd/nand.h 2021-06-07 13:01:34.000000000 +0300 @@ -80,6 +80,7 @@ @@ -94342,7 +93928,6 @@ diff -urN linux-4.9.37/include/linux/mtd/nand.h linux-4.9.y/include/linux/mtd/na /* The maximum expected count of bytes in the NAND ID sequence */ #define NAND_MAX_ID_LEN 8 -diff -urN linux-4.9.37/include/linux/mtd/spi-nor.h linux-4.9.y/include/linux/mtd/spi-nor.h --- linux-4.9.37/include/linux/mtd/spi-nor.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/mtd/spi-nor.h 2021-06-07 13:01:34.000000000 +0300 @@ -12,7 +12,6 @@ @@ -94687,7 +94272,6 @@ diff -urN linux-4.9.37/include/linux/mtd/spi-nor.h linux-4.9.y/include/linux/mtd +#endif #endif -diff -urN linux-4.9.37/include/linux/nospec.h linux-4.9.y/include/linux/nospec.h --- linux-4.9.37/include/linux/nospec.h 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/include/linux/nospec.h 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,72 @@ @@ -94763,7 +94347,6 @@ diff -urN linux-4.9.37/include/linux/nospec.h linux-4.9.y/include/linux/nospec.h + _i; \ + }) +#endif /* _LINUX_NOSPEC_H */ -diff -urN linux-4.9.37/include/linux/phy.h linux-4.9.y/include/linux/phy.h --- linux-4.9.37/include/linux/phy.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/phy.h 2021-06-07 13:01:34.000000000 +0300 @@ -829,6 +829,10 @@ @@ -94777,7 +94360,6 @@ diff -urN linux-4.9.37/include/linux/phy.h linux-4.9.y/include/linux/phy.h int phy_init_eee(struct phy_device *phydev, bool clk_stop_enable); int phy_get_eee_err(struct phy_device *phydev); int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data); -diff -urN linux-4.9.37/include/linux/psci.h linux-4.9.y/include/linux/psci.h --- linux-4.9.37/include/linux/psci.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/psci.h 2021-06-07 13:01:34.000000000 +0300 @@ -25,7 +25,14 @@ @@ -94803,7 +94385,6 @@ diff -urN linux-4.9.37/include/linux/psci.h linux-4.9.y/include/linux/psci.h }; extern struct psci_operations psci_ops; -diff -urN linux-4.9.37/include/linux/sched.h linux-4.9.y/include/linux/sched.h --- linux-4.9.37/include/linux/sched.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/sched.h 2021-06-07 13:01:34.000000000 +0300 @@ -24,6 +24,7 @@ @@ -94822,7 +94403,6 @@ diff -urN linux-4.9.37/include/linux/sched.h linux-4.9.y/include/linux/sched.h #include #include #include -diff -urN linux-4.9.37/include/linux/spi/spi.h linux-4.9.y/include/linux/spi/spi.h --- linux-4.9.37/include/linux/spi/spi.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/spi/spi.h 2021-06-07 13:01:34.000000000 +0300 @@ -233,6 +233,8 @@ @@ -94851,7 +94431,6 @@ diff -urN linux-4.9.37/include/linux/spi/spi.h linux-4.9.y/include/linux/spi/spi /* * on some hardware transfer / message size may be constrained -diff -urN linux-4.9.37/include/linux/tcp.h linux-4.9.y/include/linux/tcp.h --- linux-4.9.37/include/linux/tcp.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/tcp.h 2021-06-07 13:01:34.000000000 +0300 @@ -432,4 +432,7 @@ @@ -94862,7 +94441,6 @@ diff -urN linux-4.9.37/include/linux/tcp.h linux-4.9.y/include/linux/tcp.h + int shiftlen); + #endif /* _LINUX_TCP_H */ -diff -urN linux-4.9.37/include/linux/usb/usbnet.h linux-4.9.y/include/linux/usb/usbnet.h --- linux-4.9.37/include/linux/usb/usbnet.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/linux/usb/usbnet.h 2021-06-07 13:01:34.000000000 +0300 @@ -204,6 +204,7 @@ @@ -94873,7 +94451,6 @@ diff -urN linux-4.9.37/include/linux/usb/usbnet.h linux-4.9.y/include/linux/usb/ extern int usbnet_cdc_bind(struct usbnet *, struct usb_interface *); extern void usbnet_cdc_unbind(struct usbnet *, struct usb_interface *); extern void usbnet_cdc_status(struct usbnet *, struct urb *); -diff -urN linux-4.9.37/include/net/netns/ipv4.h linux-4.9.y/include/net/netns/ipv4.h --- linux-4.9.37/include/net/netns/ipv4.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/net/netns/ipv4.h 2021-06-07 13:01:34.000000000 +0300 @@ -94,6 +94,7 @@ @@ -94884,7 +94461,6 @@ diff -urN linux-4.9.37/include/net/netns/ipv4.h linux-4.9.y/include/net/netns/ip int sysctl_tcp_probe_threshold; u32 sysctl_tcp_probe_interval; -diff -urN linux-4.9.37/include/net/tcp.h linux-4.9.y/include/net/tcp.h --- linux-4.9.37/include/net/tcp.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/net/tcp.h 2021-06-07 13:01:34.000000000 +0300 @@ -53,6 +53,8 @@ @@ -94896,7 +94472,6 @@ diff -urN linux-4.9.37/include/net/tcp.h linux-4.9.y/include/net/tcp.h /* * Never offer a window over 32767 without using window scaling. Some -diff -urN linux-4.9.37/include/uapi/linux/i2c-dev.h linux-4.9.y/include/uapi/linux/i2c-dev.h --- linux-4.9.37/include/uapi/linux/i2c-dev.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/uapi/linux/i2c-dev.h 2021-06-07 13:01:34.000000000 +0300 @@ -50,6 +50,9 @@ @@ -94909,7 +94484,6 @@ diff -urN linux-4.9.37/include/uapi/linux/i2c-dev.h linux-4.9.y/include/uapi/lin /* This is the structure as used in the I2C_SMBUS ioctl call */ -diff -urN linux-4.9.37/include/uapi/linux/i2c.h linux-4.9.y/include/uapi/linux/i2c.h --- linux-4.9.37/include/uapi/linux/i2c.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/uapi/linux/i2c.h 2021-06-07 13:01:34.000000000 +0300 @@ -71,12 +71,19 @@ @@ -94932,7 +94506,6 @@ diff -urN linux-4.9.37/include/uapi/linux/i2c.h linux-4.9.y/include/uapi/linux/i __u16 len; /* msg length */ __u8 *buf; /* pointer to msg data */ }; -diff -urN linux-4.9.37/include/uapi/linux/jffs2.h linux-4.9.y/include/uapi/linux/jffs2.h --- linux-4.9.37/include/uapi/linux/jffs2.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/uapi/linux/jffs2.h 2021-06-07 13:01:34.000000000 +0300 @@ -46,6 +46,7 @@ @@ -94943,7 +94516,6 @@ diff -urN linux-4.9.37/include/uapi/linux/jffs2.h linux-4.9.y/include/uapi/linux /* Compatibility flags. */ #define JFFS2_COMPAT_MASK 0xc000 /* What do to if an unknown nodetype is found */ #define JFFS2_NODE_ACCURATE 0x2000 -diff -urN linux-4.9.37/include/uapi/linux/msdos_fs.h linux-4.9.y/include/uapi/linux/msdos_fs.h --- linux-4.9.37/include/uapi/linux/msdos_fs.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/uapi/linux/msdos_fs.h 2021-06-07 13:01:34.000000000 +0300 @@ -95,7 +95,23 @@ @@ -94981,7 +94553,6 @@ diff -urN linux-4.9.37/include/uapi/linux/msdos_fs.h linux-4.9.y/include/uapi/li struct fat_boot_sector { __u8 ignored[3]; /* Boot strap short or near jump */ __u8 system_id[8]; /* Name - can be used to special case -diff -urN linux-4.9.37/include/uapi/linux/psci.h linux-4.9.y/include/uapi/linux/psci.h --- linux-4.9.37/include/uapi/linux/psci.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/uapi/linux/psci.h 2021-06-07 13:01:34.000000000 +0300 @@ -87,6 +87,9 @@ @@ -94994,7 +94565,6 @@ diff -urN linux-4.9.37/include/uapi/linux/psci.h linux-4.9.y/include/uapi/linux/ /* PSCI features decoding (>=1.0) */ #define PSCI_1_0_FEATURES_CPU_SUSPEND_PF_SHIFT 1 -diff -urN linux-4.9.37/include/uapi/linux/snmp.h linux-4.9.y/include/uapi/linux/snmp.h --- linux-4.9.37/include/uapi/linux/snmp.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/uapi/linux/snmp.h 2021-06-07 13:01:34.000000000 +0300 @@ -281,6 +281,7 @@ @@ -95005,7 +94575,6 @@ diff -urN linux-4.9.37/include/uapi/linux/snmp.h linux-4.9.y/include/uapi/linux/ __LINUX_MIB_MAX }; -diff -urN linux-4.9.37/include/uapi/linux/usb/ch9.h linux-4.9.y/include/uapi/linux/usb/ch9.h --- linux-4.9.37/include/uapi/linux/usb/ch9.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/uapi/linux/usb/ch9.h 2021-06-07 13:01:34.000000000 +0300 @@ -423,6 +423,14 @@ @@ -95051,7 +94620,6 @@ diff -urN linux-4.9.37/include/uapi/linux/usb/ch9.h linux-4.9.y/include/uapi/lin } static inline int usb_endpoint_interrupt_type( -diff -urN linux-4.9.37/include/uapi/linux/usb/video.h linux-4.9.y/include/uapi/linux/usb/video.h --- linux-4.9.37/include/uapi/linux/usb/video.h 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/include/uapi/linux/usb/video.h 2021-06-07 13:01:34.000000000 +0300 @@ -303,7 +303,7 @@ @@ -95137,12 +94705,10 @@ diff -urN linux-4.9.37/include/uapi/linux/usb/video.h linux-4.9.y/include/uapi/l + #endif /* __LINUX_USB_VIDEO_H */ -diff -urN linux-4.9.37/kernel/debug/kdb/.gitignore linux-4.9.y/kernel/debug/kdb/.gitignore --- linux-4.9.37/kernel/debug/kdb/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/kernel/debug/kdb/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -gen-kdb_cmds.c -diff -urN linux-4.9.37/kernel/.gitignore linux-4.9.y/kernel/.gitignore --- linux-4.9.37/kernel/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/kernel/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,7 +0,0 @@ @@ -95153,7 +94719,6 @@ diff -urN linux-4.9.37/kernel/.gitignore linux-4.9.y/kernel/.gitignore -config_data.gz -timeconst.h -hz.bc -diff -urN linux-4.9.37/kernel/sched/cputime.c linux-4.9.y/kernel/sched/cputime.c --- linux-4.9.37/kernel/sched/cputime.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/kernel/sched/cputime.c 2021-06-07 13:01:34.000000000 +0300 @@ -75,6 +75,9 @@ @@ -95166,7 +94731,6 @@ diff -urN linux-4.9.37/kernel/sched/cputime.c linux-4.9.y/kernel/sched/cputime.c irq_cputime = nsecs_to_cputime64(irqtime) - cpustat[idx]; irq_cputime = min(irq_cputime, maxtime); cpustat[idx] += irq_cputime; -diff -urN linux-4.9.37/lib/.gitignore linux-4.9.y/lib/.gitignore --- linux-4.9.37/lib/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/lib/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,6 +0,0 @@ @@ -95176,7 +94740,6 @@ diff -urN linux-4.9.37/lib/.gitignore linux-4.9.y/lib/.gitignore -gen_crc32table -crc32table.h -oid_registry_data.c -diff -urN linux-4.9.37/lib/Kconfig linux-4.9.y/lib/Kconfig --- linux-4.9.37/lib/Kconfig 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/lib/Kconfig 2021-06-07 13:01:34.000000000 +0300 @@ -241,6 +241,12 @@ @@ -95201,7 +94764,6 @@ diff -urN linux-4.9.37/lib/Kconfig linux-4.9.y/lib/Kconfig config REED_SOLOMON_ENC8 bool -diff -urN linux-4.9.37/lib/lzma/LzFind.c linux-4.9.y/lib/lzma/LzFind.c --- linux-4.9.37/lib/lzma/LzFind.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/lib/lzma/LzFind.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,711 @@ @@ -95916,7 +95478,6 @@ diff -urN linux-4.9.37/lib/lzma/LzFind.c linux-4.9.y/lib/lzma/LzFind.c + vTable->Skip = (Mf_Skip_Func)Bt4_MatchFinder_Skip; + } +} -diff -urN linux-4.9.37/lib/lzma/LzmaDec.c linux-4.9.y/lib/lzma/LzmaDec.c --- linux-4.9.37/lib/lzma/LzmaDec.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/lib/lzma/LzmaDec.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,999 @@ @@ -96919,7 +96480,6 @@ diff -urN linux-4.9.37/lib/lzma/LzmaDec.c linux-4.9.y/lib/lzma/LzmaDec.c + LzmaDec_FreeProbs(&p, alloc); + return res; +} -diff -urN linux-4.9.37/lib/lzma/LzmaEnc.c linux-4.9.y/lib/lzma/LzmaEnc.c --- linux-4.9.37/lib/lzma/LzmaEnc.c 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/lib/lzma/LzmaEnc.c 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,2271 @@ @@ -99194,7 +98754,6 @@ diff -urN linux-4.9.37/lib/lzma/LzmaEnc.c linux-4.9.y/lib/lzma/LzmaEnc.c + LzmaEnc_Destroy(p, alloc, allocBig); + return res; +} -diff -urN linux-4.9.37/lib/lzma/Makefile linux-4.9.y/lib/lzma/Makefile --- linux-4.9.37/lib/lzma/Makefile 1970-01-01 03:00:00.000000000 +0300 +++ linux-4.9.y/lib/lzma/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -0,0 +1,7 @@ @@ -99205,7 +98764,6 @@ diff -urN linux-4.9.37/lib/lzma/Makefile linux-4.9.y/lib/lzma/Makefile +obj-$(CONFIG_LZMA_DECOMPRESS) += lzma_decompress.o + +EXTRA_CFLAGS += -Iinclude/linux -Iinclude/linux/lzma -include types.h -diff -urN linux-4.9.37/lib/Makefile linux-4.9.y/lib/Makefile --- linux-4.9.37/lib/Makefile 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/lib/Makefile 2021-06-07 13:01:34.000000000 +0300 @@ -1,6 +1,15 @@ @@ -99233,7 +98791,6 @@ diff -urN linux-4.9.37/lib/Makefile linux-4.9.y/lib/Makefile lib-$(CONFIG_DECOMPRESS_GZIP) += decompress_inflate.o lib-$(CONFIG_DECOMPRESS_BZIP2) += decompress_bunzip2.o -diff -urN linux-4.9.37/lib/raid6/.gitignore linux-4.9.y/lib/raid6/.gitignore --- linux-4.9.37/lib/raid6/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/lib/raid6/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,6 +0,0 @@ @@ -99243,7 +98800,6 @@ diff -urN linux-4.9.37/lib/raid6/.gitignore linux-4.9.y/lib/raid6/.gitignore -tables.c -neon?.c -s390vx?.c -diff -urN linux-4.9.37/mm/init-mm.c linux-4.9.y/mm/init-mm.c --- linux-4.9.37/mm/init-mm.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/mm/init-mm.c 2021-06-07 13:01:34.000000000 +0300 @@ -25,3 +25,5 @@ @@ -99252,7 +98808,6 @@ diff -urN linux-4.9.37/mm/init-mm.c linux-4.9.y/mm/init-mm.c }; + +EXPORT_SYMBOL(init_mm); -diff -urN linux-4.9.37/mm/page_alloc.c linux-4.9.y/mm/page_alloc.c --- linux-4.9.37/mm/page_alloc.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/mm/page_alloc.c 2021-06-07 13:01:34.000000000 +0300 @@ -7335,7 +7335,7 @@ @@ -99264,7 +98819,6 @@ diff -urN linux-4.9.37/mm/page_alloc.c linux-4.9.y/mm/page_alloc.c __func__, outer_start, end); ret = -EBUSY; goto done; -diff -urN linux-4.9.37/net/core/net_namespace.c linux-4.9.y/net/core/net_namespace.c --- linux-4.9.37/net/core/net_namespace.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/core/net_namespace.c 2021-06-07 13:01:34.000000000 +0300 @@ -263,7 +263,7 @@ @@ -99276,7 +98830,6 @@ diff -urN linux-4.9.37/net/core/net_namespace.c linux-4.9.y/net/core/net_namespa spin_unlock_irqrestore(&net->nsid_lock, flags); rcu_read_unlock(); -diff -urN linux-4.9.37/net/ipv4/cipso_ipv4.c linux-4.9.y/net/ipv4/cipso_ipv4.c --- linux-4.9.37/net/ipv4/cipso_ipv4.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv4/cipso_ipv4.c 2021-06-07 13:01:34.000000000 +0300 @@ -1271,7 +1271,8 @@ @@ -99299,7 +98852,6 @@ diff -urN linux-4.9.37/net/ipv4/cipso_ipv4.c linux-4.9.y/net/ipv4/cipso_ipv4.c } return 0; -diff -urN linux-4.9.37/net/ipv4/ip_output.c linux-4.9.y/net/ipv4/ip_output.c --- linux-4.9.37/net/ipv4/ip_output.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv4/ip_output.c 2021-06-07 13:01:34.000000000 +0300 @@ -1260,7 +1260,7 @@ @@ -99311,7 +98863,6 @@ diff -urN linux-4.9.37/net/ipv4/ip_output.c linux-4.9.y/net/ipv4/ip_output.c skb_shinfo(skb)->gso_type = SKB_GSO_UDP; } cork->length += size; -diff -urN linux-4.9.37/net/ipv4/proc.c linux-4.9.y/net/ipv4/proc.c --- linux-4.9.37/net/ipv4/proc.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv4/proc.c 2021-06-07 13:01:34.000000000 +0300 @@ -305,6 +305,7 @@ @@ -99322,7 +98873,6 @@ diff -urN linux-4.9.37/net/ipv4/proc.c linux-4.9.y/net/ipv4/proc.c SNMP_MIB_SENTINEL }; -diff -urN linux-4.9.37/net/ipv4/sysctl_net_ipv4.c linux-4.9.y/net/ipv4/sysctl_net_ipv4.c --- linux-4.9.37/net/ipv4/sysctl_net_ipv4.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv4/sysctl_net_ipv4.c 2021-06-07 13:01:34.000000000 +0300 @@ -35,6 +35,8 @@ @@ -99350,7 +98900,6 @@ diff -urN linux-4.9.37/net/ipv4/sysctl_net_ipv4.c linux-4.9.y/net/ipv4/sysctl_ne .procname = "tcp_probe_threshold", .data = &init_net.ipv4.sysctl_tcp_probe_threshold, .maxlen = sizeof(int), -diff -urN linux-4.9.37/net/ipv4/tcp.c linux-4.9.y/net/ipv4/tcp.c --- linux-4.9.37/net/ipv4/tcp.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv4/tcp.c 2021-06-07 13:01:34.000000000 +0300 @@ -3289,6 +3289,7 @@ @@ -99361,7 +98910,6 @@ diff -urN linux-4.9.37/net/ipv4/tcp.c linux-4.9.y/net/ipv4/tcp.c BUILD_BUG_ON(sizeof(struct tcp_skb_cb) > FIELD_SIZEOF(struct sk_buff, cb)); -diff -urN linux-4.9.37/net/ipv4/tcp_input.c linux-4.9.y/net/ipv4/tcp_input.c --- linux-4.9.37/net/ipv4/tcp_input.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv4/tcp_input.c 2021-06-07 13:01:34.000000000 +0300 @@ -1312,7 +1312,7 @@ @@ -99467,7 +99015,6 @@ diff -urN linux-4.9.37/net/ipv4/tcp_input.c linux-4.9.y/net/ipv4/tcp_input.c node = prev; } while (node); tp->ooo_last_skb = rb_entry(prev, struct sk_buff, rbnode); -diff -urN linux-4.9.37/net/ipv4/tcp_ipv4.c linux-4.9.y/net/ipv4/tcp_ipv4.c --- linux-4.9.37/net/ipv4/tcp_ipv4.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv4/tcp_ipv4.c 2021-06-07 13:01:34.000000000 +0300 @@ -2440,6 +2440,7 @@ @@ -99478,7 +99025,6 @@ diff -urN linux-4.9.37/net/ipv4/tcp_ipv4.c linux-4.9.y/net/ipv4/tcp_ipv4.c net->ipv4.sysctl_tcp_probe_threshold = TCP_PROBE_THRESHOLD; net->ipv4.sysctl_tcp_probe_interval = TCP_PROBE_INTERVAL; -diff -urN linux-4.9.37/net/ipv4/tcp_output.c linux-4.9.y/net/ipv4/tcp_output.c --- linux-4.9.37/net/ipv4/tcp_output.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv4/tcp_output.c 2021-06-07 13:01:34.000000000 +0300 @@ -1170,6 +1170,11 @@ @@ -99503,7 +99049,6 @@ diff -urN linux-4.9.37/net/ipv4/tcp_output.c linux-4.9.y/net/ipv4/tcp_output.c return mss_now; } -diff -urN linux-4.9.37/net/ipv4/tcp_timer.c linux-4.9.y/net/ipv4/tcp_timer.c --- linux-4.9.37/net/ipv4/tcp_timer.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv4/tcp_timer.c 2021-06-07 13:01:34.000000000 +0300 @@ -125,6 +125,7 @@ @@ -99514,7 +99059,6 @@ diff -urN linux-4.9.37/net/ipv4/tcp_timer.c linux-4.9.y/net/ipv4/tcp_timer.c icsk->icsk_mtup.search_low = tcp_mss_to_mtu(sk, mss); tcp_sync_mss(sk, icsk->icsk_pmtu_cookie); } -diff -urN linux-4.9.37/net/ipv6/calipso.c linux-4.9.y/net/ipv6/calipso.c --- linux-4.9.37/net/ipv6/calipso.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv6/calipso.c 2021-06-07 13:01:34.000000000 +0300 @@ -1062,7 +1062,8 @@ @@ -99527,7 +99071,6 @@ diff -urN linux-4.9.37/net/ipv6/calipso.c linux-4.9.y/net/ipv6/calipso.c } secattr->type = NETLBL_NLTYPE_CALIPSO; -diff -urN linux-4.9.37/net/ipv6/output_core.c linux-4.9.y/net/ipv6/output_core.c --- linux-4.9.37/net/ipv6/output_core.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/ipv6/output_core.c 2021-06-07 13:01:34.000000000 +0300 @@ -78,7 +78,7 @@ @@ -99559,7 +99102,6 @@ diff -urN linux-4.9.37/net/ipv6/output_core.c linux-4.9.y/net/ipv6/output_core.c *nexthdr = &exthdr->nexthdr; } -diff -urN linux-4.9.37/net/netlabel/netlabel_kapi.c linux-4.9.y/net/netlabel/netlabel_kapi.c --- linux-4.9.37/net/netlabel/netlabel_kapi.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/netlabel/netlabel_kapi.c 2021-06-07 13:01:34.000000000 +0300 @@ -748,6 +748,12 @@ @@ -99575,60 +99117,49 @@ diff -urN linux-4.9.37/net/netlabel/netlabel_kapi.c linux-4.9.y/net/netlabel/net if (off < catmap->startbit) { off = catmap->startbit; *offset = off; -diff -urN linux-4.9.37/net/wireless/.gitignore linux-4.9.y/net/wireless/.gitignore --- linux-4.9.37/net/wireless/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/net/wireless/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -regdb.c -diff -urN linux-4.9.37/samples/auxdisplay/.gitignore linux-4.9.y/samples/auxdisplay/.gitignore --- linux-4.9.37/samples/auxdisplay/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/samples/auxdisplay/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -cfag12864b-example -diff -urN linux-4.9.37/samples/connector/.gitignore linux-4.9.y/samples/connector/.gitignore --- linux-4.9.37/samples/connector/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/samples/connector/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -ucon -diff -urN linux-4.9.37/samples/hidraw/.gitignore linux-4.9.y/samples/hidraw/.gitignore --- linux-4.9.37/samples/hidraw/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/samples/hidraw/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -hid-example -diff -urN linux-4.9.37/samples/mei/.gitignore linux-4.9.y/samples/mei/.gitignore --- linux-4.9.37/samples/mei/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/samples/mei/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -mei-amt-version -diff -urN linux-4.9.37/samples/mic/mpssd/.gitignore linux-4.9.y/samples/mic/mpssd/.gitignore --- linux-4.9.37/samples/mic/mpssd/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/samples/mic/mpssd/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -mpssd -diff -urN linux-4.9.37/samples/seccomp/.gitignore linux-4.9.y/samples/seccomp/.gitignore --- linux-4.9.37/samples/seccomp/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/samples/seccomp/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -bpf-direct -bpf-fancy -dropper -diff -urN linux-4.9.37/samples/timers/.gitignore linux-4.9.y/samples/timers/.gitignore --- linux-4.9.37/samples/timers/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/samples/timers/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -hpet_example -diff -urN linux-4.9.37/samples/watchdog/.gitignore linux-4.9.y/samples/watchdog/.gitignore --- linux-4.9.37/samples/watchdog/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/samples/watchdog/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -watchdog-simple -diff -urN linux-4.9.37/scripts/basic/.gitignore linux-4.9.y/scripts/basic/.gitignore --- linux-4.9.37/scripts/basic/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/basic/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -fixdep -bin2c -diff -urN linux-4.9.37/scripts/dtc/.gitignore linux-4.9.y/scripts/dtc/.gitignore --- linux-4.9.37/scripts/dtc/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/dtc/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -99636,14 +99167,12 @@ diff -urN linux-4.9.37/scripts/dtc/.gitignore linux-4.9.y/scripts/dtc/.gitignore -dtc-lexer.lex.c -dtc-parser.tab.c -dtc-parser.tab.h -diff -urN linux-4.9.37/scripts/gdb/linux/.gitignore linux-4.9.y/scripts/gdb/linux/.gitignore --- linux-4.9.37/scripts/gdb/linux/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/gdb/linux/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -*.pyc -*.pyo -constants.py -diff -urN linux-4.9.37/scripts/genksyms/.gitignore linux-4.9.y/scripts/genksyms/.gitignore --- linux-4.9.37/scripts/genksyms/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/genksyms/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,5 +0,0 @@ @@ -99652,7 +99181,6 @@ diff -urN linux-4.9.37/scripts/genksyms/.gitignore linux-4.9.y/scripts/genksyms/ -*.tab.c -*.tab.h -genksyms -diff -urN linux-4.9.37/scripts/.gitignore linux-4.9.y/scripts/.gitignore --- linux-4.9.37/scripts/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,16 +0,0 @@ @@ -99672,7 +99200,6 @@ diff -urN linux-4.9.37/scripts/.gitignore linux-4.9.y/scripts/.gitignore -extract-cert -sign-file -insert-sys-cert -diff -urN linux-4.9.37/scripts/kconfig/.gitignore linux-4.9.y/scripts/kconfig/.gitignore --- linux-4.9.37/scripts/kconfig/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/kconfig/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,22 +0,0 @@ @@ -99698,7 +99225,6 @@ diff -urN linux-4.9.37/scripts/kconfig/.gitignore linux-4.9.y/scripts/kconfig/.g -qconf -gconf -kxgettext -diff -urN linux-4.9.37/scripts/kconfig/lxdialog/.gitignore linux-4.9.y/scripts/kconfig/lxdialog/.gitignore --- linux-4.9.37/scripts/kconfig/lxdialog/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/kconfig/lxdialog/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -99706,7 +99232,6 @@ diff -urN linux-4.9.37/scripts/kconfig/lxdialog/.gitignore linux-4.9.y/scripts/k -# Generated files -# -lxdialog -diff -urN linux-4.9.37/scripts/Makefile.clean linux-4.9.y/scripts/Makefile.clean --- linux-4.9.37/scripts/Makefile.clean 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/Makefile.clean 2021-06-07 13:01:34.000000000 +0300 @@ -11,7 +11,7 @@ @@ -99718,7 +99243,6 @@ diff -urN linux-4.9.37/scripts/Makefile.clean linux-4.9.y/scripts/Makefile.clean # Figure out what we need to build from the various variables # ========================================================================== -diff -urN linux-4.9.37/scripts/mod/.gitignore linux-4.9.y/scripts/mod/.gitignore --- linux-4.9.37/scripts/mod/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/mod/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -99726,18 +99250,15 @@ diff -urN linux-4.9.37/scripts/mod/.gitignore linux-4.9.y/scripts/mod/.gitignore -mk_elfconfig -modpost -devicetable-offsets.h -diff -urN linux-4.9.37/scripts/selinux/genheaders/.gitignore linux-4.9.y/scripts/selinux/genheaders/.gitignore --- linux-4.9.37/scripts/selinux/genheaders/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/selinux/genheaders/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -genheaders -diff -urN linux-4.9.37/scripts/selinux/mdp/.gitignore linux-4.9.y/scripts/selinux/mdp/.gitignore --- linux-4.9.37/scripts/selinux/mdp/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/selinux/mdp/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -# Generated file -mdp -diff -urN linux-4.9.37/scripts/setlocalversion linux-4.9.y/scripts/setlocalversion --- linux-4.9.37/scripts/setlocalversion 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/scripts/setlocalversion 2021-06-07 13:01:34.000000000 +0300 @@ -153,6 +153,7 @@ @@ -99748,7 +99269,6 @@ diff -urN linux-4.9.37/scripts/setlocalversion linux-4.9.y/scripts/setlocalversi # CONFIG_LOCALVERSION and LOCALVERSION (if set) res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}" -diff -urN linux-4.9.37/security/apparmor/.gitignore linux-4.9.y/security/apparmor/.gitignore --- linux-4.9.37/security/apparmor/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/security/apparmor/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,5 +0,0 @@ @@ -99757,26 +99277,22 @@ diff -urN linux-4.9.37/security/apparmor/.gitignore linux-4.9.y/security/apparmo -# -capability_names.h -rlim_names.h -diff -urN linux-4.9.37/security/selinux/.gitignore linux-4.9.y/security/selinux/.gitignore --- linux-4.9.37/security/selinux/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/security/selinux/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -av_permissions.h -flask.h -diff -urN linux-4.9.37/security/tomoyo/.gitignore linux-4.9.y/security/tomoyo/.gitignore --- linux-4.9.37/security/tomoyo/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/security/tomoyo/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -builtin-policy.h -policy/*.conf -diff -urN linux-4.9.37/sound/oss/.gitignore linux-4.9.y/sound/oss/.gitignore --- linux-4.9.37/sound/oss/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/sound/oss/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -#Ignore generated files -pss_boot.h -trix_boot.h -diff -urN linux-4.9.37/sound/usb/mixer.c linux-4.9.y/sound/usb/mixer.c --- linux-4.9.37/sound/usb/mixer.c 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/sound/usb/mixer.c 2021-06-07 13:01:34.000000000 +0300 @@ -318,12 +318,15 @@ @@ -99818,70 +99334,58 @@ diff -urN linux-4.9.37/sound/usb/mixer.c linux-4.9.y/sound/usb/mixer.c } } usb_audio_dbg(chip, "cannot set ctl value: req = %#x, wValue = %#x, wIndex = %#x, type = %d, data = %#x/%#x\n", -diff -urN linux-4.9.37/tools/accounting/.gitignore linux-4.9.y/tools/accounting/.gitignore --- linux-4.9.37/tools/accounting/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/accounting/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -getdelays -diff -urN linux-4.9.37/tools/build/feature/.gitignore linux-4.9.y/tools/build/feature/.gitignore --- linux-4.9.37/tools/build/feature/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/build/feature/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -*.d -*.bin -*.output -diff -urN linux-4.9.37/tools/build/.gitignore linux-4.9.y/tools/build/.gitignore --- linux-4.9.37/tools/build/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/build/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -fixdep -diff -urN linux-4.9.37/tools/cgroup/.gitignore linux-4.9.y/tools/cgroup/.gitignore --- linux-4.9.37/tools/cgroup/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/cgroup/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -cgroup_event_listener -diff -urN linux-4.9.37/tools/laptop/dslm/.gitignore linux-4.9.y/tools/laptop/dslm/.gitignore --- linux-4.9.37/tools/laptop/dslm/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/laptop/dslm/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -dslm -diff -urN linux-4.9.37/tools/lguest/.gitignore linux-4.9.y/tools/lguest/.gitignore --- linux-4.9.37/tools/lguest/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/lguest/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -lguest -include -diff -urN linux-4.9.37/tools/lib/bpf/.gitignore linux-4.9.y/tools/lib/bpf/.gitignore --- linux-4.9.37/tools/lib/bpf/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/lib/bpf/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -libbpf_version.h -FEATURE-DUMP.libbpf -diff -urN linux-4.9.37/tools/lib/lockdep/.gitignore linux-4.9.y/tools/lib/lockdep/.gitignore --- linux-4.9.37/tools/lib/lockdep/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/lib/lockdep/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -liblockdep.so.* -diff -urN linux-4.9.37/tools/lib/traceevent/.gitignore linux-4.9.y/tools/lib/traceevent/.gitignore --- linux-4.9.37/tools/lib/traceevent/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/lib/traceevent/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -TRACEEVENT-CFLAGS -libtraceevent-dynamic-list -libtraceevent.so.* -diff -urN linux-4.9.37/tools/objtool/.gitignore linux-4.9.y/tools/objtool/.gitignore --- linux-4.9.37/tools/objtool/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/objtool/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -arch/x86/insn/inat-tables.c -objtool -fixdep -diff -urN linux-4.9.37/tools/pcmcia/.gitignore linux-4.9.y/tools/pcmcia/.gitignore --- linux-4.9.37/tools/pcmcia/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/pcmcia/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -crc32hash -diff -urN linux-4.9.37/tools/perf/.gitignore linux-4.9.y/tools/perf/.gitignore --- linux-4.9.37/tools/perf/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/perf/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,33 +0,0 @@ @@ -99918,7 +99422,6 @@ diff -urN linux-4.9.37/tools/perf/.gitignore linux-4.9.y/tools/perf/.gitignore -.config-detected -util/intel-pt-decoder/inat-tables.c -arch/*/include/generated/ -diff -urN linux-4.9.37/tools/perf/tests/.gitignore linux-4.9.y/tools/perf/tests/.gitignore --- linux-4.9.37/tools/perf/tests/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/perf/tests/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -99926,7 +99429,6 @@ diff -urN linux-4.9.37/tools/perf/tests/.gitignore linux-4.9.y/tools/perf/tests/ -llvm-src-kbuild.c -llvm-src-prologue.c -llvm-src-relocation.c -diff -urN linux-4.9.37/tools/power/cpupower/.gitignore linux-4.9.y/tools/power/cpupower/.gitignore --- linux-4.9.37/tools/power/cpupower/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/power/cpupower/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,29 +0,0 @@ @@ -99959,42 +99461,35 @@ diff -urN linux-4.9.37/tools/power/cpupower/.gitignore linux-4.9.y/tools/power/c -debug/i386/powernow-k8-decode -debug/x86_64/centrino-decode -debug/x86_64/powernow-k8-decode -diff -urN linux-4.9.37/tools/power/x86/turbostat/.gitignore linux-4.9.y/tools/power/x86/turbostat/.gitignore --- linux-4.9.37/tools/power/x86/turbostat/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/power/x86/turbostat/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -turbostat -diff -urN linux-4.9.37/tools/spi/.gitignore linux-4.9.y/tools/spi/.gitignore --- linux-4.9.37/tools/spi/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/spi/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -spidev_fdx -spidev_test -diff -urN linux-4.9.37/tools/testing/radix-tree/.gitignore linux-4.9.y/tools/testing/radix-tree/.gitignore --- linux-4.9.37/tools/testing/radix-tree/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/radix-tree/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -main -radix-tree.c -diff -urN linux-4.9.37/tools/testing/selftests/breakpoints/.gitignore linux-4.9.y/tools/testing/selftests/breakpoints/.gitignore --- linux-4.9.37/tools/testing/selftests/breakpoints/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/breakpoints/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -breakpoint_test -step_after_suspend_test -diff -urN linux-4.9.37/tools/testing/selftests/capabilities/.gitignore linux-4.9.y/tools/testing/selftests/capabilities/.gitignore --- linux-4.9.37/tools/testing/selftests/capabilities/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/capabilities/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -test_execve -validate_cap -diff -urN linux-4.9.37/tools/testing/selftests/efivarfs/.gitignore linux-4.9.y/tools/testing/selftests/efivarfs/.gitignore --- linux-4.9.37/tools/testing/selftests/efivarfs/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/efivarfs/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -create-read -open-unlink -diff -urN linux-4.9.37/tools/testing/selftests/exec/.gitignore linux-4.9.y/tools/testing/selftests/exec/.gitignore --- linux-4.9.37/tools/testing/selftests/exec/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/exec/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,9 +0,0 @@ @@ -100008,12 +99503,10 @@ diff -urN linux-4.9.37/tools/testing/selftests/exec/.gitignore linux-4.9.y/tools -execveat.denatured -xxxxxxxx* \ В конце файла нет новой строки -diff -urN linux-4.9.37/tools/testing/selftests/filesystems/.gitignore linux-4.9.y/tools/testing/selftests/filesystems/.gitignore --- linux-4.9.37/tools/testing/selftests/filesystems/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/filesystems/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -dnotify_test -diff -urN linux-4.9.37/tools/testing/selftests/futex/functional/.gitignore linux-4.9.y/tools/testing/selftests/futex/functional/.gitignore --- linux-4.9.37/tools/testing/selftests/futex/functional/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/futex/functional/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,7 +0,0 @@ @@ -100024,35 +99517,29 @@ diff -urN linux-4.9.37/tools/testing/selftests/futex/functional/.gitignore linux -futex_wait_timeout -futex_wait_uninitialized_heap -futex_wait_wouldblock -diff -urN linux-4.9.37/tools/testing/selftests/ia64/.gitignore linux-4.9.y/tools/testing/selftests/ia64/.gitignore --- linux-4.9.37/tools/testing/selftests/ia64/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/ia64/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -aliasing-test -diff -urN linux-4.9.37/tools/testing/selftests/ipc/.gitignore linux-4.9.y/tools/testing/selftests/ipc/.gitignore --- linux-4.9.37/tools/testing/selftests/ipc/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/ipc/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -msgque_test -diff -urN linux-4.9.37/tools/testing/selftests/kcmp/.gitignore linux-4.9.y/tools/testing/selftests/kcmp/.gitignore --- linux-4.9.37/tools/testing/selftests/kcmp/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/kcmp/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -kcmp_test -kcmp-test-file -diff -urN linux-4.9.37/tools/testing/selftests/media_tests/.gitignore linux-4.9.y/tools/testing/selftests/media_tests/.gitignore --- linux-4.9.37/tools/testing/selftests/media_tests/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/media_tests/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -media_device_test -media_device_open -video_device_test -diff -urN linux-4.9.37/tools/testing/selftests/membarrier/.gitignore linux-4.9.y/tools/testing/selftests/membarrier/.gitignore --- linux-4.9.37/tools/testing/selftests/membarrier/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/membarrier/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -membarrier_test -diff -urN linux-4.9.37/tools/testing/selftests/memfd/.gitignore linux-4.9.y/tools/testing/selftests/memfd/.gitignore --- linux-4.9.37/tools/testing/selftests/memfd/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/memfd/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -100060,18 +99547,15 @@ diff -urN linux-4.9.37/tools/testing/selftests/memfd/.gitignore linux-4.9.y/tool -fuse_test -memfd_test -memfd-test-file -diff -urN linux-4.9.37/tools/testing/selftests/mount/.gitignore linux-4.9.y/tools/testing/selftests/mount/.gitignore --- linux-4.9.37/tools/testing/selftests/mount/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/mount/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -unprivileged-remount-test -diff -urN linux-4.9.37/tools/testing/selftests/mqueue/.gitignore linux-4.9.y/tools/testing/selftests/mqueue/.gitignore --- linux-4.9.37/tools/testing/selftests/mqueue/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/mqueue/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -mq_open_tests -mq_perf_tests -diff -urN linux-4.9.37/tools/testing/selftests/net/.gitignore linux-4.9.y/tools/testing/selftests/net/.gitignore --- linux-4.9.37/tools/testing/selftests/net/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/net/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,6 +0,0 @@ @@ -100081,14 +99565,12 @@ diff -urN linux-4.9.37/tools/testing/selftests/net/.gitignore linux-4.9.y/tools/ -reuseport_bpf -reuseport_bpf_cpu -reuseport_dualstack -diff -urN linux-4.9.37/tools/testing/selftests/networking/timestamping/.gitignore linux-4.9.y/tools/testing/selftests/networking/timestamping/.gitignore --- linux-4.9.37/tools/testing/selftests/networking/timestamping/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/networking/timestamping/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -timestamping -txtimestamp -hwtstamp_config -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/alignment/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/alignment/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/alignment/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/alignment/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,5 +0,0 @@ @@ -100097,7 +99579,6 @@ diff -urN linux-4.9.37/tools/testing/selftests/powerpc/alignment/.gitignore linu -paste_unaligned -paste_last_unaligned -copy_paste_unaligned_common -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/benchmarks/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/benchmarks/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/benchmarks/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/benchmarks/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -100106,12 +99587,10 @@ diff -urN linux-4.9.37/tools/testing/selftests/powerpc/benchmarks/.gitignore lin -mmap_bench -futex_bench \ В конце файла нет новой строки -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/context_switch/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/context_switch/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/context_switch/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/context_switch/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -cp_abort -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/copyloops/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/copyloops/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/copyloops/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/copyloops/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -100119,7 +99598,6 @@ diff -urN linux-4.9.37/tools/testing/selftests/powerpc/copyloops/.gitignore linu -copyuser_power7 -memcpy_64 -memcpy_power7 -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/dscr/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/dscr/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/dscr/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/dscr/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,7 +0,0 @@ @@ -100130,7 +99608,6 @@ diff -urN linux-4.9.37/tools/testing/selftests/powerpc/dscr/.gitignore linux-4.9 -dscr_sysfs_test -dscr_sysfs_thread_test -dscr_user_test -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/math/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/math/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/math/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/math/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,7 +0,0 @@ @@ -100141,7 +99618,6 @@ diff -urN linux-4.9.37/tools/testing/selftests/powerpc/math/.gitignore linux-4.9 -fpu_signal -vmx_signal -vsx_preempt -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/mm/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/mm/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/mm/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/mm/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,4 +0,0 @@ @@ -100150,7 +99626,6 @@ diff -urN linux-4.9.37/tools/testing/selftests/powerpc/mm/.gitignore linux-4.9.y -tempfile -prot_sao \ В конце файла нет новой строки -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/pmu/ebb/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/pmu/ebb/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/pmu/ebb/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/pmu/ebb/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,24 +0,0 @@ @@ -100179,41 +99654,34 @@ diff -urN linux-4.9.37/tools/testing/selftests/powerpc/pmu/ebb/.gitignore linux- -ebb_lmr -ebb_lmr_regs \ В конце файла нет новой строки -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/pmu/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/pmu/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/pmu/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/pmu/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -count_instructions -l3_bank_test -per_event_excludes -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/primitives/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/primitives/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/primitives/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/primitives/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -load_unaligned_zeropad -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/signal/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/signal/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/signal/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/signal/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -signal -signal_tm -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/stringloops/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/stringloops/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/stringloops/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/stringloops/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -memcmp -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/switch_endian/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/switch_endian/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/switch_endian/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/switch_endian/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -switch_endian_test -check-reversed.S -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/syscalls/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/syscalls/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/syscalls/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/syscalls/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -ipc_unmuxed -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/tm/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/tm/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/tm/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/tm/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,13 +0,0 @@ @@ -100230,29 +99698,24 @@ diff -urN linux-4.9.37/tools/testing/selftests/powerpc/tm/.gitignore linux-4.9.y -tm-signal-context-chk-gpr -tm-signal-context-chk-vmx -tm-signal-context-chk-vsx -diff -urN linux-4.9.37/tools/testing/selftests/powerpc/vphn/.gitignore linux-4.9.y/tools/testing/selftests/powerpc/vphn/.gitignore --- linux-4.9.37/tools/testing/selftests/powerpc/vphn/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/powerpc/vphn/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -test-vphn -diff -urN linux-4.9.37/tools/testing/selftests/prctl/.gitignore linux-4.9.y/tools/testing/selftests/prctl/.gitignore --- linux-4.9.37/tools/testing/selftests/prctl/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/prctl/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -disable-tsc-ctxt-sw-stress-test -disable-tsc-on-off-stress-test -disable-tsc-test -diff -urN linux-4.9.37/tools/testing/selftests/ptp/.gitignore linux-4.9.y/tools/testing/selftests/ptp/.gitignore --- linux-4.9.37/tools/testing/selftests/ptp/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/ptp/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -testptp -diff -urN linux-4.9.37/tools/testing/selftests/ptrace/.gitignore linux-4.9.y/tools/testing/selftests/ptrace/.gitignore --- linux-4.9.37/tools/testing/selftests/ptrace/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/ptrace/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -peeksiginfo -diff -urN linux-4.9.37/tools/testing/selftests/rcutorture/.gitignore linux-4.9.y/tools/testing/selftests/rcutorture/.gitignore --- linux-4.9.37/tools/testing/selftests/rcutorture/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/rcutorture/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,6 +0,0 @@ @@ -100262,17 +99725,14 @@ diff -urN linux-4.9.37/tools/testing/selftests/rcutorture/.gitignore linux-4.9.y -rcu-test-image -res -*.swp -diff -urN linux-4.9.37/tools/testing/selftests/seccomp/.gitignore linux-4.9.y/tools/testing/selftests/seccomp/.gitignore --- linux-4.9.37/tools/testing/selftests/seccomp/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/seccomp/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -seccomp_bpf -diff -urN linux-4.9.37/tools/testing/selftests/size/.gitignore linux-4.9.y/tools/testing/selftests/size/.gitignore --- linux-4.9.37/tools/testing/selftests/size/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/size/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -get_size -diff -urN linux-4.9.37/tools/testing/selftests/timers/.gitignore linux-4.9.y/tools/testing/selftests/timers/.gitignore --- linux-4.9.37/tools/testing/selftests/timers/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/timers/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,19 +0,0 @@ @@ -100295,13 +99755,11 @@ diff -urN linux-4.9.37/tools/testing/selftests/timers/.gitignore linux-4.9.y/too -threadtest -valid-adjtimex -adjtick -diff -urN linux-4.9.37/tools/testing/selftests/vDSO/.gitignore linux-4.9.y/tools/testing/selftests/vDSO/.gitignore --- linux-4.9.37/tools/testing/selftests/vDSO/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/vDSO/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -vdso_test -vdso_standalone_test_x86 -diff -urN linux-4.9.37/tools/testing/selftests/vm/.gitignore linux-4.9.y/tools/testing/selftests/vm/.gitignore --- linux-4.9.37/tools/testing/selftests/vm/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/vm/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,10 +0,0 @@ @@ -100315,23 +99773,19 @@ diff -urN linux-4.9.37/tools/testing/selftests/vm/.gitignore linux-4.9.y/tools/t -transhuge-stress -userfaultfd -mlock-intersect-test -diff -urN linux-4.9.37/tools/testing/selftests/watchdog/.gitignore linux-4.9.y/tools/testing/selftests/watchdog/.gitignore --- linux-4.9.37/tools/testing/selftests/watchdog/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/watchdog/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -watchdog-test -diff -urN linux-4.9.37/tools/testing/selftests/x86/.gitignore linux-4.9.y/tools/testing/selftests/x86/.gitignore --- linux-4.9.37/tools/testing/selftests/x86/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/testing/selftests/x86/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -*_32 -*_64 -diff -urN linux-4.9.37/tools/thermal/tmon/.gitignore linux-4.9.y/tools/thermal/tmon/.gitignore --- linux-4.9.37/tools/thermal/tmon/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/thermal/tmon/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1 +0,0 @@ -/tmon -diff -urN linux-4.9.37/tools/usb/usbip/.gitignore linux-4.9.y/tools/usb/usbip/.gitignore --- linux-4.9.37/tools/usb/usbip/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/usb/usbip/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,28 +0,0 @@ @@ -100363,20 +99817,17 @@ diff -urN linux-4.9.37/tools/usb/usbip/.gitignore linux-4.9.y/tools/usb/usbip/.g -libsrc/libusbip_la-vhci_driver.lo -src/usbip -src/usbipd -diff -urN linux-4.9.37/tools/virtio/.gitignore linux-4.9.y/tools/virtio/.gitignore --- linux-4.9.37/tools/virtio/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/virtio/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,3 +0,0 @@ -*.d -virtio_test -vringh_test -diff -urN linux-4.9.37/tools/vm/.gitignore linux-4.9.y/tools/vm/.gitignore --- linux-4.9.37/tools/vm/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/tools/vm/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,2 +0,0 @@ -slabinfo -page-types -diff -urN linux-4.9.37/usr/.gitignore linux-4.9.y/usr/.gitignore --- linux-4.9.37/usr/.gitignore 2017-07-12 16:42:41.000000000 +0300 +++ linux-4.9.y/usr/.gitignore 1970-01-01 03:00:00.000000000 +0300 @@ -1,10 +0,0 @@