Linux v3.18-rc1-280-g816fb4175c29
This commit is contained in:
		
							parent
							
								
									92add980cd
								
							
						
					
					
						commit
						3fbe156c4a
					
				| @ -14,10 +14,10 @@ Signed-off-by: David Howells <dhowells@redhat.com> | |||||||
|  1 file changed, 20 insertions(+) |  1 file changed, 20 insertions(+) | ||||||
| 
 | 
 | ||||||
| diff --git a/include/linux/efi.h b/include/linux/efi.h
 | diff --git a/include/linux/efi.h b/include/linux/efi.h
 | ||||||
| index ebe6a24cc1e1..5ce40e215f15 100644
 | index 130ba866a24a..58d7feadd149 100644
 | ||||||
| --- a/include/linux/efi.h
 | --- a/include/linux/efi.h
 | ||||||
| +++ b/include/linux/efi.h
 | +++ b/include/linux/efi.h
 | ||||||
| @@ -581,6 +581,12 @@ void efi_native_runtime_setup(void);
 | @@ -586,6 +586,12 @@ void efi_native_runtime_setup(void);
 | ||||||
|  #define DEVICE_TREE_GUID \ |  #define DEVICE_TREE_GUID \ | ||||||
|      EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 ) |      EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 ) | ||||||
|   |   | ||||||
| @ -30,7 +30,7 @@ index ebe6a24cc1e1..5ce40e215f15 100644 | |||||||
|  typedef struct { |  typedef struct { | ||||||
|  	efi_guid_t guid; |  	efi_guid_t guid; | ||||||
|  	u64 table; |  	u64 table; | ||||||
| @@ -796,6 +802,20 @@ typedef struct _efi_file_io_interface {
 | @@ -801,6 +807,20 @@ typedef struct _efi_file_io_interface {
 | ||||||
|   |   | ||||||
|  #define EFI_INVALID_TABLE_ADDR		(~0UL) |  #define EFI_INVALID_TABLE_ADDR		(~0UL) | ||||||
|   |   | ||||||
|  | |||||||
| @ -159,12 +159,12 @@ index 000000000000..424896a0b169 | |||||||
| +	return 0;
 | +	return 0;
 | ||||||
| +}
 | +}
 | ||||||
| diff --git a/include/linux/efi.h b/include/linux/efi.h
 | diff --git a/include/linux/efi.h b/include/linux/efi.h
 | ||||||
| index 5ce40e215f15..41359e548bcb 100644
 | index 58d7feadd149..b1d686e9175e 100644
 | ||||||
| --- a/include/linux/efi.h
 | --- a/include/linux/efi.h
 | ||||||
| +++ b/include/linux/efi.h
 | +++ b/include/linux/efi.h
 | ||||||
| @@ -906,6 +906,10 @@ extern bool efi_poweroff_required(void);
 | @@ -919,6 +919,10 @@ extern bool efi_poweroff_required(void);
 | ||||||
|  	     (md) <= (efi_memory_desc_t *)((m)->map_end - (m)->desc_size); \ |  char * __init efi_md_typeattr_format(char *buf, size_t size, | ||||||
|  	     (md) = (void *)(md) + (m)->desc_size) |  				     const efi_memory_desc_t *md); | ||||||
|   |   | ||||||
| +struct key;
 | +struct key;
 | ||||||
| +extern int __init parse_efi_signature_list(const void *data, size_t size,
 | +extern int __init parse_efi_signature_list(const void *data, size_t size,
 | ||||||
|  | |||||||
| @ -54,7 +54,7 @@ index f2327e88e07c..4ba047a782fd 100644 | |||||||
|  	def_bool y |  	def_bool y | ||||||
|  	prompt "Enable seccomp to safely compute untrusted bytecode" |  	prompt "Enable seccomp to safely compute untrusted bytecode" | ||||||
| diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
 | diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
 | ||||||
| index de8eebd6f67c..975d11bfaf5b 100644
 | index 1acf605a646d..6da2da7ac9c3 100644
 | ||||||
| --- a/arch/x86/boot/compressed/eboot.c
 | --- a/arch/x86/boot/compressed/eboot.c
 | ||||||
| +++ b/arch/x86/boot/compressed/eboot.c
 | +++ b/arch/x86/boot/compressed/eboot.c
 | ||||||
| @@ -12,6 +12,7 @@
 | @@ -12,6 +12,7 @@
 | ||||||
| @ -65,7 +65,7 @@ index de8eebd6f67c..975d11bfaf5b 100644 | |||||||
|   |   | ||||||
|  #undef memcpy			/* Use memcpy from misc.c */ |  #undef memcpy			/* Use memcpy from misc.c */ | ||||||
|   |   | ||||||
| @@ -814,6 +815,37 @@ out:
 | @@ -828,6 +829,37 @@ out:
 | ||||||
|  	return status; |  	return status; | ||||||
|  } |  } | ||||||
|   |   | ||||||
| @ -103,7 +103,7 @@ index de8eebd6f67c..975d11bfaf5b 100644 | |||||||
|  /* |  /* | ||||||
|   * See if we have Graphics Output Protocol |   * See if we have Graphics Output Protocol | ||||||
|   */ |   */ | ||||||
| @@ -1389,6 +1421,10 @@ struct boot_params *efi_main(struct efi_config *c,
 | @@ -1407,6 +1439,10 @@ struct boot_params *efi_main(struct efi_config *c,
 | ||||||
|  	else |  	else | ||||||
|  		setup_boot_services32(efi_early); |  		setup_boot_services32(efi_early); | ||||||
|   |   | ||||||
|  | |||||||
| @ -25,10 +25,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> | |||||||
|  create mode 100644 kernel/modsign_uefi.c |  create mode 100644 kernel/modsign_uefi.c | ||||||
| 
 | 
 | ||||||
| diff --git a/include/linux/efi.h b/include/linux/efi.h
 | diff --git a/include/linux/efi.h b/include/linux/efi.h
 | ||||||
| index 41359e548bcb..db9e6118575e 100644
 | index b1d686e9175e..4d41f4532127 100644
 | ||||||
| --- a/include/linux/efi.h
 | --- a/include/linux/efi.h
 | ||||||
| +++ b/include/linux/efi.h
 | +++ b/include/linux/efi.h
 | ||||||
| @@ -587,6 +587,12 @@ void efi_native_runtime_setup(void);
 | @@ -592,6 +592,12 @@ void efi_native_runtime_setup(void);
 | ||||||
|  #define EFI_CERT_X509_GUID \ |  #define EFI_CERT_X509_GUID \ | ||||||
|      EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 ) |      EFI_GUID(  0xa5c059a1, 0x94e4, 0x4aa7, 0x87, 0xb5, 0xab, 0x15, 0x5c, 0x2b, 0xf0, 0x72 ) | ||||||
|   |   | ||||||
|  | |||||||
| @ -15,10 +15,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> | |||||||
|  2 files changed, 2 insertions(+), 2 deletions(-) |  2 files changed, 2 insertions(+), 2 deletions(-) | ||||||
| 
 | 
 | ||||||
| diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
 | diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
 | ||||||
| index 988160a4ad31..5b6cdde792a4 100644
 | index 74339c57b914..3251c36e0e5d 100644
 | ||||||
| --- a/Documentation/kernel-parameters.txt
 | --- a/Documentation/kernel-parameters.txt
 | ||||||
| +++ b/Documentation/kernel-parameters.txt
 | +++ b/Documentation/kernel-parameters.txt
 | ||||||
| @@ -3701,7 +3701,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 | @@ -3705,7 +3705,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 | ||||||
|  			the allocated input device; If set to 0, video driver |  			the allocated input device; If set to 0, video driver | ||||||
|  			will only send out the event without touching backlight |  			will only send out the event without touching backlight | ||||||
|  			brightness level. |  			brightness level. | ||||||
|  | |||||||
| @ -14,10 +14,10 @@ Upstream-status: http://lists.freedesktop.org/archives/intel-gfx/2013-November/0 | |||||||
|  1 file changed, 1 insertion(+), 1 deletion(-) |  1 file changed, 1 insertion(+), 1 deletion(-) | ||||||
| 
 | 
 | ||||||
| diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
 | diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
 | ||||||
| index 507370513f3d..fa5bc89a4c93 100644
 | index c9e220963a78..9a705e52ab26 100644
 | ||||||
| --- a/drivers/gpu/drm/i915/intel_display.c
 | --- a/drivers/gpu/drm/i915/intel_display.c
 | ||||||
| +++ b/drivers/gpu/drm/i915/intel_display.c
 | +++ b/drivers/gpu/drm/i915/intel_display.c
 | ||||||
| @@ -10966,7 +10966,7 @@ check_crtc_state(struct drm_device *dev)
 | @@ -10963,7 +10963,7 @@ check_crtc_state(struct drm_device *dev)
 | ||||||
|   |   | ||||||
|  		if (active && |  		if (active && | ||||||
|  		    !intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) { |  		    !intel_pipe_config_compare(dev, &crtc->config, &pipe_config)) { | ||||||
|  | |||||||
| @ -26,10 +26,10 @@ index 13c0835f907a..fbae2bf99a47 100644 | |||||||
|  #endif |  #endif | ||||||
|   |   | ||||||
| diff --git a/include/linux/efi.h b/include/linux/efi.h
 | diff --git a/include/linux/efi.h b/include/linux/efi.h
 | ||||||
| index 45cb4ffdea62..ebe6a24cc1e1 100644
 | index 0949f9c7e872..130ba866a24a 100644
 | ||||||
| --- a/include/linux/efi.h
 | --- a/include/linux/efi.h
 | ||||||
| +++ b/include/linux/efi.h
 | +++ b/include/linux/efi.h
 | ||||||
| @@ -923,6 +923,7 @@ extern int __init efi_setup_pcdp_console(char *);
 | @@ -936,6 +936,7 @@ extern int __init efi_setup_pcdp_console(char *);
 | ||||||
|  #define EFI_64BIT		5	/* Is the firmware 64-bit? */ |  #define EFI_64BIT		5	/* Is the firmware 64-bit? */ | ||||||
|  #define EFI_PARAVIRT		6	/* Access is via a paravirt interface */ |  #define EFI_PARAVIRT		6	/* Access is via a paravirt interface */ | ||||||
|  #define EFI_ARCH_1		7	/* First arch-specific bit */ |  #define EFI_ARCH_1		7	/* First arch-specific bit */ | ||||||
|  | |||||||
| @ -14,10 +14,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> | |||||||
|  1 file changed, 19 insertions(+), 1 deletion(-) |  1 file changed, 19 insertions(+), 1 deletion(-) | ||||||
| 
 | 
 | ||||||
| diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
 | diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
 | ||||||
| index 975d11bfaf5b..94bf7819857a 100644
 | index 6da2da7ac9c3..ba3cf70c7d5a 100644
 | ||||||
| --- a/arch/x86/boot/compressed/eboot.c
 | --- a/arch/x86/boot/compressed/eboot.c
 | ||||||
| +++ b/arch/x86/boot/compressed/eboot.c
 | +++ b/arch/x86/boot/compressed/eboot.c
 | ||||||
| @@ -817,8 +817,9 @@ out:
 | @@ -831,8 +831,9 @@ out:
 | ||||||
|   |   | ||||||
|  static int get_secure_boot(void) |  static int get_secure_boot(void) | ||||||
|  { |  { | ||||||
| @ -28,7 +28,7 @@ index 975d11bfaf5b..94bf7819857a 100644 | |||||||
|  	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID; |  	efi_guid_t var_guid = EFI_GLOBAL_VARIABLE_GUID; | ||||||
|  	efi_status_t status; |  	efi_status_t status; | ||||||
|   |   | ||||||
| @@ -842,6 +843,23 @@ static int get_secure_boot(void)
 | @@ -856,6 +857,23 @@ static int get_secure_boot(void)
 | ||||||
|  	if (setup == 1) |  	if (setup == 1) | ||||||
|  		return 0; |  		return 0; | ||||||
|   |   | ||||||
|  | |||||||
| @ -69,7 +69,7 @@ Summary: The Linux kernel | |||||||
| # The rc snapshot level | # The rc snapshot level | ||||||
| %define rcrev 1 | %define rcrev 1 | ||||||
| # The git snapshot level | # The git snapshot level | ||||||
| %define gitrev 2 | %define gitrev 3 | ||||||
| # Set rpm version accordingly | # Set rpm version accordingly | ||||||
| %define rpmversion 3.%{upstream_sublevel}.0 | %define rpmversion 3.%{upstream_sublevel}.0 | ||||||
| %endif | %endif | ||||||
| @ -2208,6 +2208,9 @@ fi | |||||||
| #                                    ||----w | | #                                    ||----w | | ||||||
| #                                    ||     || | #                                    ||     || | ||||||
| %changelog | %changelog | ||||||
|  | * Fri Oct 24 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git3.1 | ||||||
|  | - Linux v3.18-rc1-280-g816fb4175c29 | ||||||
|  | 
 | ||||||
| * Wed Oct 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git2.1 | * Wed Oct 22 2014 Josh Boyer <jwboyer@fedoraproject.org> - 3.18.0-0.rc1.git2.1 | ||||||
| - Linux v3.18-rc1-221-gc3351dfabf5c | - Linux v3.18-rc1-221-gc3351dfabf5c | ||||||
| - Add patch to fix wifi on X550VB machines (rhbz 1089731) | - Add patch to fix wifi on X550VB machines (rhbz 1089731) | ||||||
|  | |||||||
							
								
								
									
										3
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								sources
									
									
									
									
									
								
							| @ -1,5 +1,4 @@ | |||||||
| fb30d0f29214d75cddd2faa94f73d5cf  linux-3.17.tar.xz | fb30d0f29214d75cddd2faa94f73d5cf  linux-3.17.tar.xz | ||||||
| 159e969cbc27201d8e2fa0f609dc722f  perf-man-3.17.tar.gz | 159e969cbc27201d8e2fa0f609dc722f  perf-man-3.17.tar.gz | ||||||
| e765b9b3a7db1a947467cb27dbc15314  patch-3.18-rc1.xz | e765b9b3a7db1a947467cb27dbc15314  patch-3.18-rc1.xz | ||||||
| 56c6712958c20af532cf77de127bf66f  patch-3.18-rc1-git1.xz | c92d73fbb956a1738060366236d0aa73  patch-3.18-rc1-git3.xz | ||||||
| 7f8580cbfa5b7dfcf9ffec5a78af3068  patch-3.18-rc1-git2.xz |  | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user