4.19-stable patches

added patches:
	remove-.orig-pattern-from-.gitignore.patch

diff --git a/queue-4.19/remove-.orig-pattern-from-.gitignore.patch b/queue-4.19/remove-.orig-pattern-from-.gitignore.patch
new file mode 100644 (file)
index 0000000..46943bf
--- /dev/null
+++ b/queue-4.19/remove-.orig-pattern-from-.gitignore.patch
@@ -0,0 +1,57 @@
+From 76be4f5a784533c71afbbb1b8f2963ef9e2ee258 Mon Sep 17 00:00:00 2001
+From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Date: Mon, 29 Jul 2024 18:57:38 +0300
+Subject: Remove *.orig pattern from .gitignore
+
+From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+
+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 <laurent.pinchart@ideasonboard.com>
+[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 <gregkh@linuxfoundation.org>
+
+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 <masahiroy@kernel.org>
+---
+ .gitignore |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/.gitignore
++++ b/.gitignore
+@@ -114,7 +114,6 @@ GTAGS
+ # id-utils files
+ ID
+ 
+-*.orig
+ *~
+ \#*#
+ 

diff --git a/queue-4.19/series b/queue-4.19/series
index e7f392b21cce0789dfe3073bc7e3ce44dd8704ef..a828ba29e0a39d764cbe4d38b800fd8949b2977c 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -110,3 +110,4 @@ tcp-check-skb-is-non-null-in-tcp_rto_delta_us.patch
 net-qrtr-update-packets-cloning-when-broadcasting.patch
 netfilter-ctnetlink-compile-ctnetlink_label_size-wit.patch
 crypto-aead-cipher-zeroize-key-buffer-after-use.patch
+remove-.orig-pattern-from-.gitignore.patch