diff options
16 files changed, 61 insertions, 20 deletions
diff --git a/f12.patch b/hv-delete-struct-hv_dev_port_info.patch index 537b96463870fe..081e3ba7ed928c 100644 --- a/f12.patch +++ b/hv-delete-struct-hv_dev_port_info.patch @@ -1,3 +1,12 @@ +From foo@baz Fri Sep 13 10:12:54 PDT 2013 +Date: Fri, 13 Sep 2013 10:12:54 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: hv: delete struct hv_dev_port_info + +It's no longer needed, and the struct hv_ring_buffer_debug_info +structure shouldn't be "global" so move it to the local .h file instead. + Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> diff --git a/f11.patch b/hv-delete-vmbus_get_debug_info.patch index 15e1dc0652656a..327805de822240 100644 --- a/f11.patch +++ b/hv-delete-vmbus_get_debug_info.patch @@ -1,3 +1,12 @@ +From foo@baz Fri Sep 13 10:12:49 PDT 2013 +Date: Fri, 13 Sep 2013 10:12:49 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: hv: delete vmbus_get_debug_info() + +It's only used once, only contains 2 function calls, so just make those +calls directly, deleting the function, and the now unneeded structure +entirely. Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> diff --git a/f07.patch b/hv-make-monitor_pages-a-real-pointer-array.patch index 5bac79530350b4..5bac79530350b4 100644 --- a/f07.patch +++ b/hv-make-monitor_pages-a-real-pointer-array.patch diff --git a/f05.patch b/hv-move-class_id-bus-attribute-to-dev_groups.patch index 3fcfdec558aa8b..3fcfdec558aa8b 100644 --- a/f05.patch +++ b/hv-move-class_id-bus-attribute-to-dev_groups.patch diff --git a/f10.patch b/hv-move-client-server_monitor_conn_id-bus-attributes-to-dev_groups.patch index 687163c0f37242..201e5dbe0c720d 100644 --- a/f10.patch +++ b/hv-move-client-server_monitor_conn_id-bus-attributes-to-dev_groups.patch @@ -1,3 +1,12 @@ +From foo@baz Fri Sep 13 10:12:42 PDT 2013 +Date: Fri, 13 Sep 2013 10:12:42 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: hv: move "client/server_monitor_conn_id" bus attributes to dev_groups + +This moves the "client_monitor_conn_id" and "server_monitor_conn_id" bus +attributes to the dev_groups structure, removing the need for it to be +in a temporary structure. Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> diff --git a/f09.patch b/hv-move-client-server_monitor_latency-bus-attributes-to-dev_groups.patch index bcce69e4cf33a2..8cd690a47e3f16 100644 --- a/f09.patch +++ b/hv-move-client-server_monitor_latency-bus-attributes-to-dev_groups.patch @@ -2,7 +2,11 @@ From foo@baz Mon Sep 9 14:41:49 PDT 2013 Date: Mon, 09 Sep 2013 14:41:49 -0700 To: Greg KH <gregkh@linuxfoundation.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: +Subject: hv: move "client/server_monitor_latency" bus attributes to dev_groups + +This moves the "client_monitor_latency" and "server_monitor_latency" bus +attributes to the dev_groups structure, removing the need for it to be +in a temporary structure. Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> diff --git a/f08.patch b/hv-move-client-server_monitor_pending-bus-attributes-to-dev_groups.patch index cae0173c15be61..b1d945309f5506 100644 --- a/f08.patch +++ b/hv-move-client-server_monitor_pending-bus-attributes-to-dev_groups.patch @@ -5,8 +5,8 @@ From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Subject: hv: move "client/server_monitor_pending" bus attributes to dev_groups This moves the "client_monitor_pending" and "server_monitor_pending" bus -attributes to the dev_groups structure, removing the need for it to be in a -temporary structure. +attributes to the dev_groups structure, removing the need for it to be +in a temporary structure. Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> diff --git a/f06.patch b/hv-move-device_id-bus-attribute-to-dev_groups.patch index 1648353b41bbe9..1648353b41bbe9 100644 --- a/f06.patch +++ b/hv-move-device_id-bus-attribute-to-dev_groups.patch diff --git a/f04.patch b/hv-move-modalias-bus-attribute-to-dev_groups.patch index 1043a9efb953d9..1043a9efb953d9 100644 --- a/f04.patch +++ b/hv-move-modalias-bus-attribute-to-dev_groups.patch diff --git a/f03.patch b/hv-move-monitor_id-bus-attribute-to-dev_groups.patch index ba76e2ca7a2de0..ba76e2ca7a2de0 100644 --- a/f03.patch +++ b/hv-move-monitor_id-bus-attribute-to-dev_groups.patch diff --git a/f13.patch b/hv-move-ringbuffer-bus-attributes-to-dev_groups.patch index cbe3ecada4ea7a..39c98824c8a132 100644 --- a/f13.patch +++ b/hv-move-ringbuffer-bus-attributes-to-dev_groups.patch @@ -1,3 +1,13 @@ +From foo@baz Fri Sep 13 10:12:58 PDT 2013 +Date: Fri, 13 Sep 2013 10:12:58 -0700 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: hv: move ringbuffer bus attributes to dev_groups + +This moves the ringbuffer bus attributes to the dev_groups structure, +deletes the now unneeded struct hv_device_info, and removes some now +unused functions, and variables as everything is now moved to the +dev_groups structure, dev_attrs is no longer needed. Cc: "K. Y. Srinivasan" <kys@microsoft.com> Cc: Haiyang Zhang <haiyangz@microsoft.com> diff --git a/f02.patch b/hv-move-state-bus-attribute-to-dev_groups.patch index 8b77dbbbc24650..8b77dbbbc24650 100644 --- a/f02.patch +++ b/hv-move-state-bus-attribute-to-dev_groups.patch diff --git a/f01.patch b/hv-use-dev_groups-for-device-attributes.patch index 141bc857968b3e..141bc857968b3e 100644 --- a/f01.patch +++ b/hv-use-dev_groups-for-device-attributes.patch diff --git a/p03.patch b/p03.patch index 94398ea91ee915..4709d871da3dba 100644 --- a/p03.patch +++ b/p03.patch @@ -17,7 +17,7 @@ int pnp_register_protocol(struct pnp_protocol *protocol); --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c -@@ -233,7 +233,7 @@ struct bus_type pnp_bus_type = { +@@ -246,7 +246,7 @@ struct bus_type pnp_bus_type = { .remove = pnp_device_remove, .shutdown = pnp_device_shutdown, .pm = &pnp_bus_dev_pm_ops, diff --git a/pmu_bus-convert-bus-code-to-use-dev_groups.patch b/pmu_bus-convert-bus-code-to-use-dev_groups.patch index f15fdf5607977e..3d54517ace0b77 100644 --- a/pmu_bus-convert-bus-code-to-use-dev_groups.patch +++ b/pmu_bus-convert-bus-code-to-use-dev_groups.patch @@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/kernel/events/core.c +++ b/kernel/events/core.c -@@ -6270,6 +6270,7 @@ type_show(struct device *dev, struct dev +@@ -6271,6 +6271,7 @@ type_show(struct device *dev, struct dev return snprintf(page, PAGE_SIZE-1, "%d\n", pmu->type); } @@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> static ssize_t perf_event_mux_interval_ms_show(struct device *dev, -@@ -6314,17 +6315,19 @@ perf_event_mux_interval_ms_store(struct +@@ -6315,17 +6316,19 @@ perf_event_mux_interval_ms_store(struct return count; } @@ -36,20 +36,20 @@ pmu_bus-convert-bus-code-to-use-dev_groups.patch driver-core-remove-dev_attrs-from-struct-class.patch driver-core-remove-dev_bin_attrs-from-struct-class.patch -f01.patch - -f02.patch -f03.patch -f04.patch -f05.patch -f06.patch -f07.patch -f08.patch -f09.patch -f10.patch -f11.patch -f12.patch -f13.patch +hv-use-dev_groups-for-device-attributes.patch +hv-move-state-bus-attribute-to-dev_groups.patch +hv-move-monitor_id-bus-attribute-to-dev_groups.patch +hv-move-modalias-bus-attribute-to-dev_groups.patch +hv-move-class_id-bus-attribute-to-dev_groups.patch +hv-move-device_id-bus-attribute-to-dev_groups.patch +hv-make-monitor_pages-a-real-pointer-array.patch +hv-move-client-server_monitor_pending-bus-attributes-to-dev_groups.patch +hv-move-client-server_monitor_latency-bus-attributes-to-dev_groups.patch +hv-move-client-server_monitor_conn_id-bus-attributes-to-dev_groups.patch +hv-delete-vmbus_get_debug_info.patch +hv-delete-struct-hv_dev_port_info.patch +hv-move-ringbuffer-bus-attributes-to-dev_groups.patch + driver-core-remove-struct-bus_type.bus_attrs.patch driver-core-remove-struct-bus_type.drv_attrs.patch driver-core-remove-struct-bus_type.dev_attrs.patch |