kernel: replace cosmetic UBIFS patches with what went upstream

Signed-off-by: Daniel Golle <daniel@makrotopia.org>

2 files changed, 14 insertions, 30 deletions

diff --git a/target/linux/generic/patches-4.1/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch b/target/linux/generic/patches-4.1/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch
index ee679fa755..0b02fff39b 100644
--- a/target/linux/generic/patches-4.1/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch
+++ b/target/linux/generic/patches-4.1/046-ubifs-silence-error-output-if-MS_SILENT-is-set.patch
@@ -1,29 +1,24 @@
-From 6da56ec248e48c9c78721f51528c178adec3b35b Mon Sep 17 00:00:00 2001
-In-Reply-To: <5765615E.5010409@nod.at>
-References: <5765615E.5010409@nod.at>
+From 1ae92642e5900316011736072b4fa91710840620 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
-Date: Sat, 18 Jun 2016 11:42:52 +0200
-Subject: [PATCH] ubifs: silence error output if MS_SILENT is set
-X-Patchwork-Id: 637491
-X-Patchwork-Delegate: richard.weinberger@gmail.com
-To: linux-mtd@lists.infradead.org
-Cc: Artem Bityutskiy <dedekind1@gmail.com>,
-    Richard Weinberger <richard.weinberger@gmail.com>
+Date: Sat, 18 Jun 2016 17:53:45 +0200
+Subject: [PATCH] ubifs: Silence error output if MS_SILENT is set
 
-This change completes
-commit 90bea5a3f0bf680b87b90516f3c231997f4b8f3b
+This change completes commit
+90bea5a3f0 ("UBIFS: respect MS_SILENT mount flag")
 which already implements support for MS_SILENT except for that one
 error message which is still being displayed despite MS_SILENT being
 set. Suppress that error message as well in case MS_SILENT is set.
 
 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+[rw: massaged commit message]
+Signed-off-by: Richard Weinberger <richard@nod.at>
 ---
  fs/ubifs/super.c | 5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
 
 --- a/fs/ubifs/super.c
 +++ b/fs/ubifs/super.c
-@@ -2107,8 +2107,9 @@ static struct dentry *ubifs_mount(struct
+@@ -2104,8 +2104,9 @@ static struct dentry *ubifs_mount(struct
  	 */
  	ubi = open_ubi(name, UBI_READONLY);
  	if (IS_ERR(ubi)) {
diff --git a/target/linux/generic/patches-4.1/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch b/target/linux/generic/patches-4.1/047-ubifs-silence-early-error-if-MS_SILENT-is-set.patch
index 290a7d69c6..cbcacd43eb 100644
--- a/target/linux/generic/patches-4.1/047-ubifs-silence-another-error-if-MS_SILENT-is-set.patch
+++ b/target/linux/generic/patches-4.1/047-ubifs-silence-early-error-if-MS_SILENT-is-set.patch
@@ -1,30 +1,22 @@
-From de2bc135f26a784ea8a83ee8b3458aa599f91ec0 Mon Sep 17 00:00:00 2001
+From dccbc9197d2c3614f2fd6811874e1d982e4415f0 Mon Sep 17 00:00:00 2001
 From: Daniel Golle <daniel@makrotopia.org>
-Date: Mon, 18 Jul 2016 23:26:17 +0200
-Subject: [PATCH] ubifs: silence another error if MS_SILENT is set
-To: linux-mtd@lists.infradead.org
-Cc: Artem Bityutskiy <dedekind1@gmail.com>,
-    Richard Weinberger <richard.weinberger@gmail.com>
+Date: Tue, 19 Jul 2016 00:26:55 +0200
+Subject: [PATCH] ubifs: Silence early error messages if MS_SILENT is set
 
 Probe-mounting a volume too small for UBIFS results in kernel log
 polution which might irritate users.
 Address this by silencing errors which may happen during boot if the
 rootfs is e.g. squashfs (and thus rather small) stored on a UBI volume.
-This commit should be seen in context with
-commit 65fb47721925628bf85ec08c4302ac5e7224a66a
-and
-commit 90bea5a3f0bf680b87b90516f3c231997f4b8f3b
 
 Signed-off-by: Daniel Golle <daniel@makrotopia.org>
+Signed-off-by: Richard Weinberger <richard@nod.at>
 ---
  fs/ubifs/super.c | 14 +++++++-------
  1 file changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/fs/ubifs/super.c b/fs/ubifs/super.c
-index 736dd58..4ec0510 100644
 --- a/fs/ubifs/super.c
 +++ b/fs/ubifs/super.c
-@@ -520,19 +520,19 @@ static int init_constants_early(struct ubifs_info *c)
+@@ -516,19 +516,19 @@ static int init_constants_early(struct u
  	c->max_write_shift = fls(c->max_write_size) - 1;
  
  	if (c->leb_size < UBIFS_MIN_LEB_SZ) {
@@ -49,7 +41,7 @@ index 736dd58..4ec0510 100644
  		return -EINVAL;
  	}
  
-@@ -543,8 +543,8 @@ static int init_constants_early(struct ubifs_info *c)
+@@ -539,8 +539,8 @@ static int init_constants_early(struct u
  	if (c->max_write_size < c->min_io_size ||
  	    c->max_write_size % c->min_io_size ||
  	    !is_power_of_2(c->max_write_size)) {
@@ -60,6 +52,3 @@ index 736dd58..4ec0510 100644
  		return -EINVAL;
  	}
  
--- 
-2.9.0
-