From: Greg Kroah-Hartman Date: Tue, 1 Oct 2024 08:43:39 +0000 (+0200) Subject: 6.1-stable patches X-Git-Tag: v6.6.54~99 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2c20439e4203481f17ac34ee7e20d116e5156836;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-stable patches added patches: remove-.orig-pattern-from-.gitignore.patch --- diff --git a/queue-6.1/remove-.orig-pattern-from-.gitignore.patch b/queue-6.1/remove-.orig-pattern-from-.gitignore.patch new file mode 100644 index 00000000000..65db7f29409 --- /dev/null +++ b/queue-6.1/remove-.orig-pattern-from-.gitignore.patch @@ -0,0 +1,57 @@ +From 76be4f5a784533c71afbbb1b8f2963ef9e2ee258 Mon Sep 17 00:00:00 2001 +From: Laurent Pinchart +Date: Mon, 29 Jul 2024 18:57:38 +0300 +Subject: Remove *.orig pattern from .gitignore + +From: Laurent Pinchart + +commit 76be4f5a784533c71afbbb1b8f2963ef9e2ee258 upstream. + +Commit 3f1b0e1f2875 (".gitignore update") added *.orig and *.rej +patterns to .gitignore in v2.6.23. The commit message didn't give a +rationale. Later on, commit 1f5d3a6b6532 ("Remove *.rej pattern from +.gitignore") removed the *.rej pattern in v2.6.26, on the rationale that +*.rej files indicated something went really wrong and should not be +ignored. + +The *.rej files are now shown by `git status`, which helps located +conflicts when applying patches and lowers the probability that they +will go unnoticed. It is however still easy to overlook the *.orig files +which slowly polute the source tree. That's not as big of a deal as not +noticing a conflict, but it's still not nice. + +Drop the *.orig pattern from .gitignore to avoid this and help keep the +source tree clean. + +Signed-off-by: Laurent Pinchart +[masahiroy@kernel.org: +I do not have a strong opinion about this. Perhaps some people may have +a different opinion. +Signed-off-by: Greg Kroah-Hartman + +If you are someone who wants to ignore *.orig, it is likely you would +want to do so across all projects. Then, $XDG_CONFIG_HOME/git/ignore +would be more suitable for your needs. gitignore(5) suggests, "Patterns +which a user wants Git to ignore in all situations generally go into a +file specified by core.excludesFile in the user's ~/.gitconfig". + +Please note that you cannot do the opposite; if *.orig is ignored by +the project's .gitignore, you cannot override the decision because +$XDG_CONFIG_HOME/git/ignore has a lower priority. + +If *.orig is sitting on the fence, I'd leave it to the users. ] +Signed-off-by: Masahiro Yamada +--- + .gitignore | 1 - + 1 file changed, 1 deletion(-) + +--- a/.gitignore ++++ b/.gitignore +@@ -133,7 +133,6 @@ GTAGS + # id-utils files + ID + +-*.orig + *~ + \#*# + diff --git a/queue-6.1/series b/queue-6.1/series index baf0663e3c7..ebf82144ebd 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -296,3 +296,4 @@ selinux-smack-don-t-bypass-permissions-check-in-inode_setsecctx-hook.patch drm-vmwgfx-prevent-unmapping-active-read-buffers.patch io_uring-sqpoll-retain-test-for-whether-the-cpu-is-valid.patch io_uring-sqpoll-do-not-put-cpumask-on-stack.patch +remove-.orig-pattern-from-.gitignore.patch