sync to torvalds/linux@ab75170

JiauZhang · Jan 5, 2025 · e22fbeb · e22fbeb
1 parent 899ec2e
commit e22fbeb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.gitpicker.json b/.gitpicker.json
@@ -2,7 +2,7 @@
     {
         "user": "torvalds",
         "repo": "linux",
-        "branch": "059dd502b263d8a4e2a84809cf1068d6a3905e6f",
+        "branch": "ab75170520d4964f3acf8bb1f91d34cbc650688e",
         "data": [
             {
                 "root": "scripts/kconfig",

diff --git a/conf.c b/conf.c
@@ -866,4 +866,4 @@ int main(int ac, char **av)
 		}
 	}
 	return 0;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -866,4 +866,4 @@ int main(int ac, char **av) @@
     		}
     	}
     	return 0;
-    }
+    }