diff options
| author | Josh Boyer <jwboyer@fedoraproject.org> | 2015-05-15 09:17:22 -0400 |
|---|---|---|
| committer | Josh Boyer <jwboyer@fedoraproject.org> | 2015-05-15 09:17:22 -0400 |
| commit | ea896256a407513f86b4e11d4c8bd83fe4d6a747 (patch) | |
| tree | 8fe5b6050bd59327090713040bb43f03c3e12c82 | |
| parent | 2844a7d7e1ae32cc002d5dcf1e1181dc6934cb14 (diff) | |
| download | kernel-ea896256a407513f86b4e11d4c8bd83fe4d6a747.tar.gz kernel-ea896256a407513f86b4e11d4c8bd83fe4d6a747.tar.xz kernel-ea896256a407513f86b4e11d4c8bd83fe4d6a747.zip | |
Linux v4.1-rc3-177-gf0897f4cc0fc
| -rw-r--r-- | acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch | 4 | ||||
| -rw-r--r-- | kernel.spec | 5 | ||||
| -rw-r--r-- | sources | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch index bb0e0c7e8..5d606a984 100644 --- a/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch +++ b/acpi-Ignore-acpi_rsdp-kernel-parameter-when-module-l.patch @@ -13,7 +13,7 @@ Signed-off-by: Josh Boyer <jwboyer@redhat.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c -index 39748bb3a543..72edfeedb326 100644 +index 7ccba395c9dd..9cbdbccf3dc3 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -44,6 +44,7 @@ @@ -24,7 +24,7 @@ index 39748bb3a543..72edfeedb326 100644 #include <asm/io.h> #include <asm/uaccess.h> -@@ -255,7 +256,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp); +@@ -252,7 +253,7 @@ early_param("acpi_rsdp", setup_acpi_rsdp); acpi_physical_address __init acpi_os_get_root_pointer(void) { #ifdef CONFIG_KEXEC diff --git a/kernel.spec b/kernel.spec index 3262eacb3..c2cbbb955 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 3 # The git snapshot level -%define gitrev 2 +%define gitrev 3 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2212,6 +2212,9 @@ fi # # %changelog +* Fri May 15 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc3.git3.1 +- Linux v4.1-rc3-177-gf0897f4cc0fc + * Thu May 14 2015 Josh Boyer <jwboyer@fedoraproject.org> - Fix non-empty dir removal in overlayfs (rhbz 1220915) @@ -1,4 +1,4 @@ a86916bd12798220da9eb4a1eec3616d linux-4.0.tar.xz d125eecce68ab6fb5f1f23523c2c04b8 perf-man-4.0.tar.gz a858fe84bfa6428ff24852221613131f patch-4.1-rc3.xz -7366c7b633485fc46e13232f568cc15a patch-4.1-rc3-git2.xz +9dff2b4094cd06ccd7fa2f0a003f5e4b patch-4.1-rc3-git3.xz |