forked from rpms/kernel
		
	Linux v4.3-7965-gd1e41ff
This commit is contained in:
		
							parent
							
								
									68a6702006
								
							
						
					
					
						commit
						cddb783d0d
					
				| @ -5315,6 +5315,9 @@ CONFIG_APM_POWER=m | ||||
| # CONFIG_CHARGER_BQ24257 is not set | ||||
| # CONFIG_CHARGER_BQ25890 is not set | ||||
| # CONFIG_CHARGER_RT9455 is not set | ||||
| # CONFIG_CHARGER_QCOM_SMBB is not set | ||||
| # CONFIG_CHARGER_TPS65217 is not set | ||||
| # CONFIG_AXP20X_POWER is not set | ||||
| 
 | ||||
| CONFIG_POWER_RESET=y | ||||
| # CONFIG_POWER_RESET_LTC2952 is not set | ||||
| @ -5754,3 +5757,7 @@ CONFIG_POWERCAP=y | ||||
| # CONFIG_STM is not set | ||||
| # CONFIG_STM_DUMMY is not set | ||||
| # CONFIG_STM_SOURCE_CONSOLE is not set | ||||
| 
 | ||||
| # CONFIG_AHCI_QORIQ is not set | ||||
| # CONFIG_COMMON_CLK_SI514 is not set | ||||
| # CONFIG_CLK_QORIQ is not set | ||||
|  | ||||
| @ -60,6 +60,7 @@ CONFIG_EFI_RUNTIME_MAP=y | ||||
| CONFIG_INTEL_IOMMU=y | ||||
| CONFIG_INTEL_IOMMU_FLOPPY_WA=y | ||||
| # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set | ||||
| CONFIG_INTEL_IOMMU_SVM=y | ||||
| CONFIG_SCSI_ADVANSYS=m | ||||
| 
 | ||||
| CONFIG_CAPI_EICON=y | ||||
| @ -398,6 +399,7 @@ CONFIG_ACPI_CMPC=m | ||||
| CONFIG_MSI_WMI=m | ||||
| CONFIG_TOSHIBA_BT_RFKILL=m | ||||
| CONFIG_TOSHIBA_HAPS=m | ||||
| CONFIG_TOSHIBA_WMI=m | ||||
| 
 | ||||
| CONFIG_VGA_SWITCHEROO=y | ||||
| CONFIG_LPC_SCH=m | ||||
|  | ||||
							
								
								
									
										2
									
								
								gitrev
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gitrev
									
									
									
									
									
								
							| @ -1 +1 @@ | ||||
| 8e483ed1342a4ea45b70f0f33ac54eff7a33d918 | ||||
| d1e41ff11941784f469f17795a4d9425c2eb4b7a | ||||
|  | ||||
| @ -67,7 +67,7 @@ Summary: The Linux kernel | ||||
| # The rc snapshot level | ||||
| %define rcrev 0 | ||||
| # The git snapshot level | ||||
| %define gitrev 3 | ||||
| %define gitrev 4 | ||||
| # Set rpm version accordingly | ||||
| %define rpmversion 4.%{upstream_sublevel}.0 | ||||
| %endif | ||||
| @ -2036,6 +2036,9 @@ fi | ||||
| # | ||||
| #  | ||||
| %changelog | ||||
| * Fri Nov 06 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git4.1 | ||||
| - Linux v4.3-7965-gd1e41ff | ||||
| 
 | ||||
| * Fri Nov  6 2015 Peter Robinson <pbrobinson@fedoraproject.org> | ||||
| - Disable Exynos IOMMU as it crashes | ||||
| - Minor ARMv7 update for battiery/charging | ||||
|  | ||||
							
								
								
									
										2
									
								
								sources
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								sources
									
									
									
									
									
								
							| @ -1,3 +1,3 @@ | ||||
| 58b35794eee3b6d52ce7be39357801e7  linux-4.3.tar.xz | ||||
| 7c516c9528b9f9aac0136944b0200b7e  perf-man-4.3.tar.gz | ||||
| 0b7adb44ce35e25110daac012c9dc055  patch-4.3-git3.xz | ||||
| 34456837ff3861686c03fe8abba0e012  patch-4.3-git4.xz | ||||
|  | ||||
| @ -1,3 +1,4 @@ | ||||
| From f1293c68aff98cd913a59b151aac938ec4ce4857 Mon Sep 17 00:00:00 2001 | ||||
| From: Dave Jones <davej@redhat.com> | ||||
| Date: Tue, 24 Jun 2014 08:43:34 -0400 | ||||
| Subject: [PATCH] watchdog: Disable watchdog on virtual machines. | ||||
| @ -20,7 +21,7 @@ Signed-off-by: Dave Jones <davej@redhat.com> | ||||
|  1 file changed, 29 insertions(+) | ||||
| 
 | ||||
| diff --git a/kernel/watchdog.c b/kernel/watchdog.c
 | ||||
| index a6ffa43f2993..b378b762844a 100644
 | ||||
| index 18f34cf..6aadffe 100644
 | ||||
| --- a/kernel/watchdog.c
 | ||||
| +++ b/kernel/watchdog.c
 | ||||
| @@ -20,6 +20,7 @@
 | ||||
| @ -31,8 +32,8 @@ index a6ffa43f2993..b378b762844a 100644 | ||||
|   | ||||
|  #include <asm/irq_regs.h> | ||||
|  #include <linux/kvm_para.h> | ||||
| @@ -155,6 +156,32 @@ static int __init softlockup_all_cpu_backtrace_setup(char *str)
 | ||||
|  __setup("softlockup_all_cpu_backtrace=", softlockup_all_cpu_backtrace_setup); | ||||
| @@ -185,6 +186,32 @@ static int __init hardlockup_all_cpu_backtrace_setup(char *str)
 | ||||
|  __setup("hardlockup_all_cpu_backtrace=", hardlockup_all_cpu_backtrace_setup); | ||||
|  #endif | ||||
|   | ||||
| +static int disable_watchdog(const struct dmi_system_id *d)
 | ||||
| @ -64,7 +65,7 @@ index a6ffa43f2993..b378b762844a 100644 | ||||
|  /* | ||||
|   * Hard-lockup warnings should be triggered after just a few seconds. Soft- | ||||
|   * lockups can have false positives under extreme conditions. So we generally | ||||
| @@ -928,6 +955,8 @@ int proc_watchdog_cpumask(struct ctl_table *table, int write,
 | ||||
| @@ -1030,6 +1057,8 @@ out:
 | ||||
|   | ||||
|  void __init lockup_detector_init(void) | ||||
|  { | ||||
| @ -73,3 +74,6 @@ index a6ffa43f2993..b378b762844a 100644 | ||||
|  	set_sample_period(); | ||||
|   | ||||
|  #ifdef CONFIG_NO_HZ_FULL | ||||
| -- 
 | ||||
| 2.5.0 | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user