Linux v4.0-10976-gd56a669ca59c
This commit is contained in:
parent
015762cdf4
commit
6a7da49029
@ -33,10 +33,10 @@ index 82fbdbc1e0b0..a811210ad486 100644
|
||||
290/040 ALL edd_mbr_sig_buffer EDD MBR signatures
|
||||
2D0/A00 ALL e820_map E820 memory map table
|
||||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
||||
index 6049d587599e..cfd53b6b95f6 100644
|
||||
index 226d5696e1d1..6a8f880e213f 100644
|
||||
--- a/arch/x86/Kconfig
|
||||
+++ b/arch/x86/Kconfig
|
||||
@@ -1696,6 +1696,16 @@ config EFI_MIXED
|
||||
@@ -1697,6 +1697,16 @@ config EFI_MIXED
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
|
@ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
|
||||
index 84960c66c77b..f5920f27596b 100644
|
||||
index f6befa9855c1..50dbe26124f0 100644
|
||||
--- a/Documentation/kernel-parameters.txt
|
||||
+++ b/Documentation/kernel-parameters.txt
|
||||
@@ -3862,7 +3862,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
||||
@@ -3863,7 +3863,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
|
||||
the allocated input device; If set to 0, video driver
|
||||
will only send out the event without touching backlight
|
||||
brightness level.
|
||||
|
@ -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 f9eeae871593..aa1dcf3d0216 100644
|
||||
index 39748bb3a543..72edfeedb326 100644
|
||||
--- a/drivers/acpi/osl.c
|
||||
+++ b/drivers/acpi/osl.c
|
||||
@@ -44,6 +44,7 @@
|
||||
|
@ -14,10 +14,10 @@ Signed-off-by: Mark Salter <msalter@redhat.com>
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c
|
||||
index 51ef97274b52..784731f5c45e 100644
|
||||
index 74753132c3ac..3cc99d7c2361 100644
|
||||
--- a/arch/arm64/kernel/setup.c
|
||||
+++ b/arch/arm64/kernel/setup.c
|
||||
@@ -568,3 +568,22 @@ const struct seq_operations cpuinfo_op = {
|
||||
@@ -579,3 +579,22 @@ const struct seq_operations cpuinfo_op = {
|
||||
.stop = c_stop,
|
||||
.show = c_show
|
||||
};
|
||||
|
@ -11,10 +11,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
|
||||
index cfd53b6b95f6..3cd149818005 100644
|
||||
index 6a8f880e213f..d3c21e9d267c 100644
|
||||
--- a/arch/x86/Kconfig
|
||||
+++ b/arch/x86/Kconfig
|
||||
@@ -1697,7 +1697,8 @@ config EFI_MIXED
|
||||
@@ -1698,7 +1698,8 @@ config EFI_MIXED
|
||||
If unsure, say N.
|
||||
|
||||
config EFI_SECURE_BOOT_SIG_ENFORCE
|
||||
|
@ -67,7 +67,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%define rcrev 0
|
||||
# The git snapshot level
|
||||
%define gitrev 13
|
||||
%define gitrev 14
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 4.%{upstream_sublevel}.0
|
||||
%endif
|
||||
@ -2193,6 +2193,9 @@ fi
|
||||
#
|
||||
#
|
||||
%changelog
|
||||
* Fri Apr 24 2015 Josh Boyer <jwboyer@fedoraproject.org> - 4.1.0-0.rc0.git14.1
|
||||
- Linux v4.0-10976-gd56a669ca59c
|
||||
|
||||
* Fri Apr 24 2015 Josh Boyer <jwboyer@fedoraproject.org>
|
||||
- Fix iscsi with QNAP devices (rhbz 1208999)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user