Merge branch 'linux-6.6.y' into package-kernel-daily

deepin-community · Jun 17, 2024 · 1d1a0c1 · 1d1a0c1
2 parents 3a79cf6 + 576d2c3
commit 1d1a0c1
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 28 deletions.
diff --git a/.github/workflows/check-patches.yml b/.github/workflows/check-patches.yml
@@ -26,7 +26,6 @@ jobs:
         repo = "${{ github.event.repository.name }}"
         pull_number = "${{ github.event.number }}"
         commit_id = "${{ github.event.pull_request.head.sha }}"
-        access_token = os.environ.get("GITHUB_TOKEN")
 
         # 获取检查脚本
         check_url = 'https://raw.githubusercontent.com/deepin-community/kernel/linux-6.6.y/scripts/checkpatch.pl'
@@ -50,7 +49,10 @@ jobs:
         # 获取文件列表
         url = f'https://api.github.com/repos/{owner}/{repo}/pulls/{pull_number}/files'
         print(url)
-        headers = {'Authorization': f'Bearer {access_token}'}
+        headers = {
+            "Accept": "application/vnd.github+json",
+            "Authorization":"Bearer " + os.environ.get("GITHUB_TOKEN")
+        }
         response = requests.get(url, headers=headers)
         files = response.json()
 
@@ -97,14 +99,15 @@ jobs:
                             line_number = match.group().split(' ')[-1]
                             line_number = line_number.replace(':', '')
                             body = r.split('\n')[0]
-                            comment_json = {
-                                "body": body,
-                                "commit_id": commit_id,
-                                "path": path,
-                                "line": int(line_number),
-                                "side": "RIGHT"
-                            }
-
-                            comment_url = f"https://api.github.com/repos/{owner}/{repo}/pulls/{pull_number}/comments"
-                            response = requests.post(comment_url, json=comment_json, headers=headers)
-                            print(response.json())
+                            if "It's generally not useful to have the filename in the file" not in body:
+                                comment_json = {
+                                    "body": body,
+                                    "commit_id": commit_id,
+                                    "path": path,
+                                    "line": int(line_number),
+                                    "side": "RIGHT"
+                                }
+
+                                comment_url = f"https://api.github.com/repos/{owner}/{repo}/pulls/{pull_number}/comments"
+                                response = requests.post(comment_url, json=comment_json, headers=headers)
+                                print(response.json())
diff --git a/arch/x86/kernel/cpu/mce/core.c b/arch/x86/kernel/cpu/mce/core.c
@@ -1946,6 +1946,7 @@ static int __mcheck_cpu_apply_quirks(struct cpuinfo_x86 *c)
 			if (cfg->monarch_timeout < 0)
 				cfg->monarch_timeout = USEC_PER_SEC;
 		}
+		mca_cfg.bios_cmci_threshold = 1;
 	}
 
 	if (cfg->monarch_timeout < 0)

diff --git a/arch/x86/kernel/cpu/zhaoxin.c b/arch/x86/kernel/cpu/zhaoxin.c
@@ -65,20 +65,6 @@ static void early_init_zhaoxin(struct cpuinfo_x86 *c)
 		set_cpu_cap(c, X86_FEATURE_CONSTANT_TSC);
 		set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC);
 	}
-
-	if (c->cpuid_level >= 0x00000001) {
-		u32 eax, ebx, ecx, edx;
-
-		cpuid(0x00000001, &eax, &ebx, &ecx, &edx);
-		/*
-		 * If HTT (EDX[28]) is set EBX[16:23] contain the number of
-		 * apicids which are reserved per package. Store the resulting
-		 * shift value for the package management code.
-		 */
-		if (edx & (1U << 28))
-			c->x86_coreid_bits = get_count_order((ebx >> 16) & 0xff);
-	}
-
 }
 
 static void init_zhaoxin(struct cpuinfo_x86 *c)

diff --git a/include/linux/fs.h b/include/linux/fs.h
@@ -484,10 +484,10 @@ struct address_space {
 	pgoff_t			writeback_index;
 	const struct address_space_operations *a_ops;
 	unsigned long		flags;
-	struct rw_semaphore	i_mmap_rwsem;
 	errseq_t		wb_err;
 	spinlock_t		private_lock;
 	struct list_head	private_list;
+	struct rw_semaphore	i_mmap_rwsem;
 	void			*private_data;
 } __attribute__((aligned(sizeof(long)))) __randomize_layout;
 	/*