diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-14 13:59:04 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-07-14 13:59:04 +0200 |
| commit | 5a7f345ba5e849229317f73497a17637c9a08e4a (patch) | |
| tree | 4d7661b70e4da95d2acfddce1ba76b7b3190cd3f /d15.patch | |
| parent | 1670862cd60c9110a93d8fdd186d4bfe51b185d1 (diff) | |
| download | patches-5a7f345ba5e849229317f73497a17637c9a08e4a.tar.gz | |
get a bunch of stuff finally upstream.
Diffstat (limited to 'd15.patch')
| -rw-r--r-- | d15.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/d15.patch b/d15.patch deleted file mode 100644 index e04e629a86a596..00000000000000 --- a/d15.patch +++ /dev/null @@ -1,32 +0,0 @@ -From foo@baz Thu Jun 8 15:34:49 CEST 2017 -Date: Thu, 08 Jun 2017 15:34:49 +0200 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: s390 squash - ---- - drivers/s390/net/ctcm_main.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - - ---- a/drivers/s390/net/ctcm_main.c -+++ b/drivers/s390/net/ctcm_main.c -@@ -1770,15 +1770,15 @@ static struct ccwgroup_driver ctcm_group - .restore = ctcm_pm_resume, - }; - --static ssize_t ctcm_driver_group_store(struct device_driver *ddrv, -- const char *buf, size_t count) -+static ssize_t group_store(struct device_driver *ddrv, const char *buf, -+ size_t count) - { - int err; - - err = ccwgroup_create_dev(ctcm_root_dev, &ctcm_group_driver, 2, buf); - return err ? err : count; - } --static DRIVER_ATTR(group, 0200, NULL, ctcm_driver_group_store); -+static DRIVER_ATTR_WO(group); - - static struct attribute *ctcm_drv_attrs[] = { - &driver_attr_group.attr, |