[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 <jkkkkk.choi@samsung.com>

diff --git a/arch/arm64/include/asm/simd.h b/arch/arm64/include/asm/simd.h
index 320838263f1e86507d4a958edd93a3f4459edc82..96959b52afae40d3aeaa8878384b939dd4aa2aab 100644 (file)
--- 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 924f62d0ed8987652f9d1054a0a31de3290d549f..bce35420aad0416f6afaf04ee73080dcbcc8215a 100644 (file)
--- 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 30da1c0050c853e81cd3f4140c4b49e7e2d3111f..1ea48534533048e8ed9c75b8679f92f9641df232 100644 (file)
--- 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 432ed1b787ee6746c21ad0307dd86fc7cce040f7..8acf06e5485254ab0bb4185ac37119d0237b6d25 100644 (file)
--- a/include/linux/fscrypt.h
+++ b/include/linux/fscrypt.h
@@ -15,7 +15,6 @@
 #define _LINUX_FSCRYPT_H
 
 #include <linux/fs.h>
-<<<<<<< HEAD
 #include <linux/mm.h>
 #include <linux/bio.h>
 #include <linux/dcache.h>
@@ -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 dd5a3ddad3666c127189cee29e87b6471de38e35..7bae3b9fbc6c933a54b96780791e7fa946ce2e96 100644 (file)
--- 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 2bc84e0adaa2a1bea2ba78be361e41753253228f..d261932ee595a048af2941943a5615983df1291f 100644 (file)
--- 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,