From 44416894c591efb3a012d122b3b44d5c3da645b0 Mon Sep 17 00:00:00 2001 From: Jaehyoung Choi Date: Tue, 31 Jul 2018 16:23:16 +0900 Subject: [PATCH] [COMMON] Fix various file for merge conflict modified: arch/arm64/include/asm/cputype.h modified: arch/arm64/include/asm/simd.h modified: arch/arm64/kernel/process.c modified: drivers/cpufreq/cpufreq_times.c modified: drivers/usb/dwc3/core.c modified: include/linux/cpufreq_times.h modified: include/linux/fscrypt.h modified: include/linux/fscrypt_notsupp.h modified: kernel/sched/cpufreq_schedutil.c modified: kernel/sched/cputime.c modified: net/netfilter/xt_qtaguid.c Change-Id: I1604d7ee8166932e5329c188c4edb1c828202234 Signed-off-by: Jaehyoung Choi --- arch/arm64/include/asm/simd.h | 13 ------------- arch/arm64/kernel/process.c | 10 ---------- drivers/usb/dwc3/core.c | 1 - include/linux/fscrypt.h | 5 +---- include/linux/fscrypt_notsupp.h | 4 +--- net/netfilter/xt_qtaguid.c | 10 ---------- 6 files changed, 2 insertions(+), 41 deletions(-) diff --git a/arch/arm64/include/asm/simd.h b/arch/arm64/include/asm/simd.h index 320838263f1e..96959b52afae 100644 --- a/arch/arm64/include/asm/simd.h +++ b/arch/arm64/include/asm/simd.h @@ -17,20 +17,7 @@ */ static __must_check inline bool may_use_simd(void) { -<<<<<<< HEAD return true; -======= - /* - * kernel_neon_busy is only set while preemption is disabled, - * and is clear whenever preemption is enabled. Since - * this_cpu_read() is atomic w.r.t. preemption, kernel_neon_busy - * cannot change under our feet -- if it's set we cannot be - * migrated, and if it's clear we cannot be migrated to a CPU - * where it is set. - */ - return !in_irq() && !irqs_disabled() && !in_nmi() && - !this_cpu_read(kernel_neon_busy); ->>>>>>> 818299f6bdae } #endif diff --git a/arch/arm64/kernel/process.c b/arch/arm64/kernel/process.c index 924f62d0ed89..bce35420aad0 100644 --- a/arch/arm64/kernel/process.c +++ b/arch/arm64/kernel/process.c @@ -222,7 +222,6 @@ static void show_data(unsigned long addr, int nbytes, const char *name) for (j = 0; j < 8; j++) { u32 data; if (probe_kernel_address(p, data)) { -<<<<<<< HEAD if (j == 7) pr_cont(" ********\n"); else @@ -235,15 +234,6 @@ static void show_data(unsigned long addr, int nbytes, const char *name) } ++p; } -======= - pr_cont(" ********"); - } else { - pr_cont(" %08x", data); - } - ++p; - } - pr_cont("\n"); ->>>>>>> 818299f6bdae } } diff --git a/drivers/usb/dwc3/core.c b/drivers/usb/dwc3/core.c index 30da1c0050c8..1ea485345330 100644 --- a/drivers/usb/dwc3/core.c +++ b/drivers/usb/dwc3/core.c @@ -398,7 +398,6 @@ static int dwc3_core_soft_reset(struct dwc3 *dwc) return -ETIMEDOUT; -<<<<<<< HEAD err_usb2phy_init: phy_exit(dwc->usb2_generic_phy); diff --git a/include/linux/fscrypt.h b/include/linux/fscrypt.h index 432ed1b787ee..8acf06e54852 100644 --- a/include/linux/fscrypt.h +++ b/include/linux/fscrypt.h @@ -15,7 +15,6 @@ #define _LINUX_FSCRYPT_H #include -<<<<<<< HEAD #include #include #include @@ -31,12 +30,10 @@ IS_ENABLED(CONFIG_UBIFS_FS_ENCRYPTION)) #endif -======= - #define FS_CRYPTO_BLOCK_SIZE 16 struct fscrypt_ctx; ->>>>>>> 818299f6bdae + struct fscrypt_info; struct fscrypt_str { diff --git a/include/linux/fscrypt_notsupp.h b/include/linux/fscrypt_notsupp.h index dd5a3ddad366..7bae3b9fbc6c 100644 --- a/include/linux/fscrypt_notsupp.h +++ b/include/linux/fscrypt_notsupp.h @@ -214,7 +214,6 @@ static inline int __fscrypt_prepare_lookup(struct inode *dir, return -EOPNOTSUPP; } -<<<<<<< HEAD static inline int fscrypt_disk_encrypted(const struct inode *inode) { return; @@ -229,7 +228,7 @@ static inline void *fscrypt_get_diskcipher(const struct inode *inode) { return NULL; } -======= + static inline int __fscrypt_prepare_symlink(struct inode *dir, unsigned int len, unsigned int max_len, @@ -254,5 +253,4 @@ static inline const char *fscrypt_get_symlink(struct inode *inode, return ERR_PTR(-EOPNOTSUPP); } ->>>>>>> 818299f6bdae #endif /* _LINUX_FSCRYPT_NOTSUPP_H */ diff --git a/net/netfilter/xt_qtaguid.c b/net/netfilter/xt_qtaguid.c index 2bc84e0adaa2..d261932ee595 100644 --- a/net/netfilter/xt_qtaguid.c +++ b/net/netfilter/xt_qtaguid.c @@ -1194,16 +1194,6 @@ static void get_dev_and_dir(const struct sk_buff *skb, parst->hook, __func__); BUG(); } -<<<<<<< HEAD -#if 0 - if (unlikely(!(*el_dev)->name)) { - pr_err("qtaguid[%d]: %s(): no dev->name?!!\n", - parst->hook, __func__); - BUG(); - } -#endif -======= ->>>>>>> 818299f6bdae if (skb->dev && *el_dev != skb->dev) { MT_DEBUG("qtaguid[%d]: skb->dev=%p %s vs par->%s=%p %s\n", parst->hook, skb->dev, skb->dev->name, -- 2.20.1