diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
| commit | 40a2bc5b5c03c7219f40be1f5be51089a156b974 (patch) | |
| tree | b0f7a9bbf7b64727a0f1b35f70ead1a4d2809736 /c06.patch | |
| parent | 7d9e0d94f09501482a336a7a2e692c159ec4c9a9 (diff) | |
| download | patches-40a2bc5b5c03c7219f40be1f5be51089a156b974.tar.gz | |
refresh and move some patches out of the main queue
Diffstat (limited to 'c06.patch')
| -rw-r--r-- | c06.patch | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/c06.patch b/c06.patch index d639cf4f9734ed..45871306c927d6 100644 --- a/c06.patch +++ b/c06.patch @@ -4,7 +4,7 @@ --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c -@@ -1276,6 +1276,13 @@ static int zram_remove(struct zram *zram +@@ -1272,6 +1272,13 @@ static int zram_remove(struct zram *zram } /* zram-control sysfs attributes */ @@ -18,7 +18,7 @@ static ssize_t hot_add_show(struct class *class, struct class_attribute *attr, char *buf) -@@ -1290,6 +1297,7 @@ static ssize_t hot_add_show(struct class +@@ -1286,6 +1293,7 @@ static ssize_t hot_add_show(struct class return ret; return scnprintf(buf, PAGE_SIZE, "%d\n", ret); } @@ -26,7 +26,7 @@ static ssize_t hot_remove_store(struct class *class, struct class_attribute *attr, -@@ -1320,23 +1328,19 @@ static ssize_t hot_remove_store(struct c +@@ -1316,23 +1324,19 @@ static ssize_t hot_remove_store(struct c mutex_unlock(&zram_index_mutex); return ret ? ret : count; } |