Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColy Li <colyli@suse.de>2018-07-09 18:43:31 +0800
committerColy Li <colyli@suse.de>2018-07-09 18:47:09 +0800
commit8725f3c6f3e8a74f8cc7dd64fe153ec0d931c1b4 (patch)
tree6d615bcee6e945b22954437a65a0008b4e54449d
parent4c47ad88fc338ae238c9000807159feb53a210a1 (diff)
mtd: cmdlinepart: Update comment for introduction of
OFFSET_CONTINUOUS (bsc#1099918).
-rw-r--r--patches.suse/0001-mtd-cmdlinepart-Update-comment-for-introduction-of-O.patch41
-rw-r--r--series.conf1
2 files changed, 42 insertions, 0 deletions
diff --git a/patches.suse/0001-mtd-cmdlinepart-Update-comment-for-introduction-of-O.patch b/patches.suse/0001-mtd-cmdlinepart-Update-comment-for-introduction-of-O.patch
new file mode 100644
index 0000000000..4ddbe5a09c
--- /dev/null
+++ b/patches.suse/0001-mtd-cmdlinepart-Update-comment-for-introduction-of-O.patch
@@ -0,0 +1,41 @@
+From 34c819073c8b8b652ced18e53bd2b0332dbe29cf Mon Sep 17 00:00:00 2001
+From: Geert Uytterhoeven <geert+renesas@glider.be>
+Date: Tue, 22 May 2018 17:07:53 +0200
+Subject: [PATCH] mtd: cmdlinepart: Update comment for introduction of
+ OFFSET_CONTINUOUS
+Git-commit: 34c819073c8b8b652ced18e53bd2b0332dbe29cf
+Patch-mainline: v4.18-rc1
+References: bsc#1099918
+
+The comment about offset zero was not updated when changing behavior:
+ - Automatic offset calculation is indicated by OFFSET_CONTINUOUS,
+ - Zero really means offset zero.
+
+Fixes: b175d03dd2072836 ("[PATCH] mtd cmdlinepart: allow zero offset value")
+Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
+Signed-off-by: Boris Brezillon <boris.brezillon@bootlin.com>
+Signed-off-by: Coly Li <colyli@suse.de>
+
+---
+ drivers/mtd/cmdlinepart.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/mtd/cmdlinepart.c b/drivers/mtd/cmdlinepart.c
+index fbd5affc0acf..3ea44cff9b75 100644
+--- a/drivers/mtd/cmdlinepart.c
++++ b/drivers/mtd/cmdlinepart.c
+@@ -190,7 +190,10 @@ static struct mtd_partition * newpart(char *s,
+ extra_mem = (unsigned char *)(parts + *num_parts);
+ }
+
+- /* enter this partition (offset will be calculated later if it is zero at this point) */
++ /*
++ * enter this partition (offset will be calculated later if it is
++ * OFFSET_CONTINUOUS at this point)
++ */
+ parts[this_part].size = size;
+ parts[this_part].offset = offset;
+ parts[this_part].mask_flags = mask_flags;
+--
+2.17.1
+
diff --git a/series.conf b/series.conf
index a924c1489f..78f5681104 100644
--- a/series.conf
+++ b/series.conf
@@ -16215,6 +16215,7 @@
patches.fixes/ipv6-omit-traffic-class-when-calculating-flow-hash.patch
patches.fixes/e1000e-Ignore-TSYNCRXCTL-when-getting-I219-clock-att.patch
patches.suse/0001-media-smiapp-fix-timeout-checking-in-smiapp_read_nvm.patch
+ patches.suse/0001-mtd-cmdlinepart-Update-comment-for-introduction-of-O.patch
patches.drivers/scsi-ipr-new-IOASC-update.patch
# mkp/scsi queue