From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Fri, 11 Dec 2015 08:49:06 +0000 (-0500)
Subject: 4.3-stable patches
X-Git-Tag: v4.1.15~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e62aaecf89ea4ca57919962c8fce51922bd24035;p=thirdparty%2Fkernel%2Fstable-queue.git

4.3-stable patches

added patches:
	certs-add-.gitignore-to-stop-git-nagging-about.patch
---

diff --git a/queue-4.3/certs-add-.gitignore-to-stop-git-nagging-about.patch b/queue-4.3/certs-add-.gitignore-to-stop-git-nagging-about.patch
new file mode 100644
index 00000000000..9d6bc3704bc
--- /dev/null
+++ b/queue-4.3/certs-add-.gitignore-to-stop-git-nagging-about.patch
@@ -0,0 +1,46 @@
+From 48dbc164b40dd9195dea8cd966e394819e420b64 Mon Sep 17 00:00:00 2001
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+Date: Wed, 21 Oct 2015 14:04:47 +0100
+Subject: certs: add .gitignore to stop git nagging about
+ x509_certificate_list
+
+From: Paul Gortmaker <paul.gortmaker@windriver.com>
+
+commit 48dbc164b40dd9195dea8cd966e394819e420b64 upstream.
+
+Currently we see this in "git status" if we build in the source dir:
+
+Untracked files:
+  (use "git add <file>..." to include in what will be committed)
+
+        certs/x509_certificate_list
+
+It looks like it used to live in kernel/ so we squash that .gitignore
+entry at the same time.  I didn't bother to dig through git history to
+see when it moved, since it is just a minor annoyance at most.
+
+Cc: David Woodhouse <dwmw2@infradead.org>
+Cc: keyrings@linux-nfs.org
+Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
+Signed-off-by: David Howells <dhowells@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ certs/.gitignore  |    4 ++++
+ kernel/.gitignore |    1 -
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+--- /dev/null
++++ b/certs/.gitignore
+@@ -0,0 +1,4 @@
++#
++# Generated files
++#
++x509_certificate_list
+--- a/kernel/.gitignore
++++ b/kernel/.gitignore
+@@ -5,4 +5,3 @@ config_data.h
+ config_data.gz
+ timeconst.h
+ hz.bc
+-x509_certificate_list
diff --git a/queue-4.3/series b/queue-4.3/series
new file mode 100644
index 00000000000..f20cdba11e6
--- /dev/null
+++ b/queue-4.3/series
@@ -0,0 +1 @@
+certs-add-.gitignore-to-stop-git-nagging-about.patch