From f66c5a87be7d325c8cd15a032f2eb8a348f5c58d Mon Sep 17 00:00:00 2001
From: tonymac32 <tonymckahan@gmail.com>
Date: Wed, 7 Feb 2018 00:38:45 -0500
Subject: [PATCH] incremental patch fixup

---
 .../04-patch-4.4.112-113.patch                | 22 ----------------
 .../04-patch-4.4.114-115.patch                | 26 -------------------
 2 files changed, 48 deletions(-)

diff --git a/patch/kernel/rockchip-default/04-patch-4.4.112-113.patch b/patch/kernel/rockchip-default/04-patch-4.4.112-113.patch
index 8a9376397..eb54f162f 100644
--- a/patch/kernel/rockchip-default/04-patch-4.4.112-113.patch
+++ b/patch/kernel/rockchip-default/04-patch-4.4.112-113.patch
@@ -697,28 +697,6 @@ index 000000000000..492370b9b35b
 +
 +#endif /* __ASSEMBLY__ */
 +#endif /* __NOSPEC_BRANCH_H__ */
-diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
-index c7b551028740..9b028204685d 100644
---- a/arch/x86/include/asm/thread_info.h
-+++ b/arch/x86/include/asm/thread_info.h
-@@ -166,17 +166,6 @@ static inline struct thread_info *current_thread_info(void)
- 	return (struct thread_info *)(current_top_of_stack() - THREAD_SIZE);
- }
- 
--static inline unsigned long current_stack_pointer(void)
--{
--	unsigned long sp;
--#ifdef CONFIG_X86_64
--	asm("mov %%rsp,%0" : "=g" (sp));
--#else
--	asm("mov %%esp,%0" : "=g" (sp));
--#endif
--	return sp;
--}
--
- #else /* !__ASSEMBLY__ */
- 
- #ifdef CONFIG_X86_64
 diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h
 index c3496619740a..156959ca49ce 100644
 --- a/arch/x86/include/asm/traps.h
diff --git a/patch/kernel/rockchip-default/04-patch-4.4.114-115.patch b/patch/kernel/rockchip-default/04-patch-4.4.114-115.patch
index 998f06247..431b1607b 100644
--- a/patch/kernel/rockchip-default/04-patch-4.4.114-115.patch
+++ b/patch/kernel/rockchip-default/04-patch-4.4.114-115.patch
@@ -34,18 +34,6 @@ index 5ad7b721b769..2ee95ece0498 100644
  	select HAVE_CMPXCHG_DOUBLE
  	select HAVE_CMPXCHG_LOCAL
  	select HAVE_DEBUG_KMEMLEAK
-diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
-index 75d0053b495a..2db93042f2f3 100644
---- a/arch/x86/Kconfig
-+++ b/arch/x86/Kconfig
-@@ -88,6 +88,7 @@ config X86
- 	select HAVE_ARCH_TRACEHOOK
- 	select HAVE_ARCH_TRANSPARENT_HUGEPAGE
- 	select HAVE_BPF_JIT			if X86_64
-+	select HAVE_EBPF_JIT			if X86_64
- 	select HAVE_CC_STACKPROTECTOR
- 	select HAVE_CMPXCHG_DOUBLE
- 	select HAVE_CMPXCHG_LOCAL
 diff --git a/arch/x86/crypto/aesni-intel_glue.c b/arch/x86/crypto/aesni-intel_glue.c
 index 3633ad6145c5..c18806b5db2a 100644
 --- a/arch/x86/crypto/aesni-intel_glue.c
@@ -956,20 +944,6 @@ index d186d0282a38..f70dd3dd4393 100644
  			_ep->maxburst = 1;
  			break;
  		}
-diff --git a/drivers/usb/gadget/function/f_fs.c b/drivers/usb/gadget/function/f_fs.c
-index 39bb65265bff..eb298daf49c7 100644
---- a/drivers/usb/gadget/function/f_fs.c
-+++ b/drivers/usb/gadget/function/f_fs.c
-@@ -3490,7 +3490,8 @@ static void ffs_closed(struct ffs_data *ffs)
- 	ci = opts->func_inst.group.cg_item.ci_parent->ci_parent;
- 	ffs_dev_unlock();
- 
--	unregister_gadget_item(ci);
-+	if (test_bit(FFS_FL_BOUND, &ffs->flags))
-+		unregister_gadget_item(ci);
- 	return;
- done:
- 	ffs_dev_unlock();
 diff --git a/drivers/usb/serial/Kconfig b/drivers/usb/serial/Kconfig
 index 56ecb8b5115d..584ae8cbaf1c 100644
 --- a/drivers/usb/serial/Kconfig