diff options
| -rw-r--r-- | driver/add-stable-branch-to-maintainers-file.patch | 4 | ||||
| -rw-r--r-- | pci/resources-insert-identical-resources-above-existing-resources.patch | 4 | ||||
| -rw-r--r-- | version | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/driver/add-stable-branch-to-maintainers-file.patch b/driver/add-stable-branch-to-maintainers-file.patch index fbf4a0e239484f..425b7cc27daf22 100644 --- a/driver/add-stable-branch-to-maintainers-file.patch +++ b/driver/add-stable-branch-to-maintainers-file.patch @@ -26,8 +26,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/MAINTAINERS +++ gregkh-2.6/MAINTAINERS -@@ -2641,6 +2641,14 @@ M: dbrownell@users.sourceforge.net - L: spi-devel-general@lists.sourceforge.net +@@ -2656,6 +2656,14 @@ M: chrisw@sous-sol.org + L: stable@kernel.org S: Maintained +STABLE BRANCH: diff --git a/pci/resources-insert-identical-resources-above-existing-resources.patch b/pci/resources-insert-identical-resources-above-existing-resources.patch index 058d6202f28184..1f5f84b1e66764 100644 --- a/pci/resources-insert-identical-resources-above-existing-resources.patch +++ b/pci/resources-insert-identical-resources-above-existing-resources.patch @@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- gregkh-2.6.orig/kernel/resource.c +++ gregkh-2.6/kernel/resource.c -@@ -341,12 +341,11 @@ EXPORT_SYMBOL(allocate_resource); +@@ -344,12 +344,11 @@ EXPORT_SYMBOL(allocate_resource); * * Returns 0 on success, -EBUSY if the resource can't be inserted. * @@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> */ int insert_resource(struct resource *parent, struct resource *new) { -@@ -354,20 +353,21 @@ int insert_resource(struct resource *par +@@ -357,20 +356,21 @@ int insert_resource(struct resource *par struct resource *first, *next; write_lock(&resource_lock); @@ -1 +1 @@ -2.6.18-rc3-git7 +2.6.18-rc4 |