Linux v3.19-4020-gce01e871a1d4
This commit is contained in:
		
							parent
							
								
									01bc4f68ee
								
							
						
					
					
						commit
						a281db6571
					
				| @ -103,6 +103,7 @@ CONFIG_NET_XGENE=y | ||||
| CONFIG_RTC_DRV_XGENE=m | ||||
| CONFIG_HW_RANDOM_XGENE=m | ||||
| CONFIG_GPIO_XGENE=y | ||||
| CONFIG_GPIO_XGENE_SB=m | ||||
| 
 | ||||
| # busted build for various reasons | ||||
| #  uses pci_* for some reason to allocate DMA buffers | ||||
|  | ||||
| @ -223,6 +223,7 @@ CONFIG_OMAP2_DSS_DSI=y | ||||
| CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 | ||||
| CONFIG_OMAP2_DSS_SLEEP_AFTER_VENC_RESET=y | ||||
| 
 | ||||
| CONFIG_DISPLAY_ENCODER_OPA362=m | ||||
| CONFIG_DISPLAY_ENCODER_TFP410=m | ||||
| CONFIG_DISPLAY_ENCODER_TPD12S015=m | ||||
| CONFIG_DISPLAY_CONNECTOR_DVI=m | ||||
| @ -309,6 +310,7 @@ CONFIG_TI_AM335X_ADC=m | ||||
| CONFIG_PWM_TIPWMSS=y | ||||
| CONFIG_MFD_TPS65218=m | ||||
| CONFIG_REGULATOR_TPS65218=m | ||||
| CONFIG_VIDEO_AM437X_VPFE=m | ||||
| 
 | ||||
| # QCom | ||||
| CONFIG_ARCH_MSM8X60=y | ||||
| @ -322,6 +324,7 @@ CONFIG_PINCTRL_APQ8084=m | ||||
| CONFIG_PINCTRL_IPQ8064=m | ||||
| CONFIG_PINCTRL_MSM8960=m | ||||
| CONFIG_PINCTRL_MSM8X74=m | ||||
| CONFIG_PINCTRL_MSM8916=m | ||||
| CONFIG_PINCTRL_QCOM_SPMI_PMIC=m | ||||
| CONFIG_COMMON_CLK_QCOM=m | ||||
| CONFIG_MFD_QCOM_RPM=m | ||||
| @ -581,6 +584,7 @@ CONFIG_SND_SOC_TEGRA_WM9712=m | ||||
| CONFIG_SND_SOC_TEGRA20_AC97=m | ||||
| CONFIG_SND_SOC_TEGRA20_DAS=m | ||||
| CONFIG_SND_SOC_TEGRA20_SPDIF=m | ||||
| CONFIG_SND_SOC_TEGRA_RT5677=m | ||||
| 
 | ||||
| # AC100 (PAZ00) | ||||
| CONFIG_MFD_NVEC=y | ||||
| @ -630,6 +634,7 @@ CONFIG_PCIE_XILINX=y | ||||
| CONFIG_CADENCE_WATCHDOG=m | ||||
| CONFIG_REGULATOR_ISL9305=m | ||||
| CONFIG_EDAC_SYNOPSYS=m | ||||
| CONFIG_PINCTRL_ZYNQ=y | ||||
| 
 | ||||
| # Multi function devices | ||||
| CONFIG_MFD_88PM800=m | ||||
|  | ||||
| @ -202,6 +202,8 @@ CONFIG_SUN4I_EMAC=m | ||||
| CONFIG_RTC_DRV_SUN6I=m | ||||
| CONFIG_AXP288_ADC=m | ||||
| CONFIG_MTD_NAND_SUNXI=m | ||||
| CONFIG_SERIO_SUN4I_PS2=m | ||||
| CONFIG_KEYBOARD_SUN4I_LRADC=m | ||||
| 
 | ||||
| # Exynos | ||||
| CONFIG_ARCH_EXYNOS3=y | ||||
| @ -359,6 +361,7 @@ CONFIG_SND_SOC_TEGRA_MAX98090=m | ||||
| CONFIG_SND_SOC_TEGRA_RT5640=m | ||||
| CONFIG_SND_SOC_TEGRA30_AHUB=m | ||||
| CONFIG_SND_SOC_TEGRA30_I2S=m | ||||
| CONFIG_SND_SOC_TEGRA_RT5677=m | ||||
| CONFIG_SND_HDA_TEGRA=m | ||||
| CONFIG_TEGRA_HOST1X=m | ||||
| CONFIG_TEGRA_HOST1X_FIREWALL=y | ||||
| @ -841,6 +844,10 @@ CONFIG_SND_SOC_TS3A227E=m | ||||
| # CONFIG_MFD_AS3711 is not set | ||||
| # CONFIG_PMIC_DA903X is not set | ||||
| # CONFIG_PMIC_ADP5520 is not set | ||||
| # CONFIG_INPUT_REGULATOR_HAPTIC is not set | ||||
| # CONFIG_INPUT_AXP20X_PEK is not set | ||||
| # CONFIG_POWER_RESET_BRCMSTB is not set | ||||
| # CONFIG_INPUT_TPS65218_PWRBUTTON is not set | ||||
| 
 | ||||
| # Debug options. We need to deal with them at some point like x86 | ||||
| # CONFIG_DEBUG_USER is not set | ||||
|  | ||||
| @ -82,3 +82,4 @@ CONFIG_GPIO_SYSCON=m | ||||
| # CONFIG_SND_SOC_TEGRA20_AC97 is not set | ||||
| # CONFIG_SND_SOC_TEGRA20_DAS is not set | ||||
| # CONFIG_SND_SOC_TEGRA20_SPDIF is not set | ||||
| # CONFIG_SND_SOC_TEGRA_RT5677 is not set | ||||
|  | ||||
| @ -150,6 +150,7 @@ CONFIG_MMC_TOSHIBA_PCI=m | ||||
| # CONFIG_MMC_SDHCI_PXAV2 is not set | ||||
| # CONFIG_MMC_SDHCI_PXAV3 is not set | ||||
| # CONFIG_MMC_SDHCI_OF_ARASAN is not set | ||||
| # CONFIG_MMC_SDHCI_F_SDH30 is not set | ||||
| # CONFIG_MMC_USDHI6ROL0 is not set | ||||
| 
 | ||||
| 
 | ||||
| @ -2314,6 +2315,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m | ||||
| # CONFIG_TOUCHSCREEN_AR1021_I2C is not set | ||||
| 
 | ||||
| CONFIG_INPUT_MISC=y | ||||
| CONFIG_INPUT_E3X0_BUTTON=m | ||||
| CONFIG_INPUT_PCSPKR=m | ||||
| CONFIG_INPUT_RETU_PWRBUTTON=m | ||||
| CONFIG_INPUT_UINPUT=m | ||||
| @ -3394,6 +3396,8 @@ CONFIG_VGA_CONSOLE=y | ||||
| CONFIG_VGACON_SOFT_SCROLLBACK=y | ||||
| CONFIG_VGACON_SOFT_SCROLLBACK_SIZE=64 | ||||
| CONFIG_DUMMY_CONSOLE=y | ||||
| CONFIG_DUMMY_CONSOLE_COLUMNS=80 | ||||
| CONFIG_DUMMY_CONSOLE_ROWS=25 | ||||
| CONFIG_FRAMEBUFFER_CONSOLE=y | ||||
| CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y | ||||
| CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y | ||||
| @ -3555,6 +3559,10 @@ CONFIG_SND_USB_UA101=m | ||||
| CONFIG_SND_USB_6FIRE=m | ||||
| CONFIG_SND_USB_HIFACE=m | ||||
| # CONFIG_SND_BCD2000 is not set | ||||
| CONFIG_SND_USB_POD=m | ||||
| CONFIG_SND_USB_PODHD=m | ||||
| CONFIG_SND_USB_TONEPORT=m | ||||
| CONFIG_SND_USB_VARIAX=m | ||||
| 
 | ||||
| # | ||||
| # PCMCIA devices | ||||
| @ -3799,6 +3807,7 @@ CONFIG_USB_GSPCA_NW80X=m | ||||
| CONFIG_USB_GSPCA_VICAM=m | ||||
| CONFIG_USB_GSPCA_KINECT=m | ||||
| CONFIG_USB_GSPCA_SE401=m | ||||
| CONFIG_USB_GSPCA_TOUPTEK=m | ||||
| 
 | ||||
| CONFIG_USB_S2255=m | ||||
| # CONFIG_VIDEO_SH_MOBILE_CEU is not set | ||||
| @ -4873,6 +4882,8 @@ CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y | ||||
| # CONFIG_SND_SOC_TLV320AIC23_I2C is not set | ||||
| # CONFIG_SND_SOC_TLV320AIC23_SPI is not set | ||||
| # CONFIG_SND_SOC_TS3A227E is not set | ||||
| # CONFIG_SND_SOC_XTFPGA_I2S is not set | ||||
| # CONFIG_SND_SOC_STA32X is not set  | ||||
| 
 | ||||
| CONFIG_BALLOON_COMPACTION=y | ||||
| CONFIG_COMPACTION=y | ||||
| @ -5010,6 +5021,8 @@ CONFIG_APM_POWER=m | ||||
| CONFIG_POWER_RESET=y | ||||
| # CONFIG_POWER_RESET_LTC2952 is not set | ||||
| # CONFIG_POWER_RESET_SYSCON is not set | ||||
| # CONFIG_BATTERY_GAUGE_LTC2941 is not set | ||||
| # CONFIG_POWER_RESET_RESTART is not set | ||||
| 
 | ||||
| # CONFIG_PDA_POWER is not set | ||||
| 
 | ||||
| @ -5308,6 +5321,7 @@ CONFIG_GPIO_VIPERBOARD=m | ||||
| # CONFIG_GPIO_MAX7301 is not set | ||||
| # CONFIG_GPIO_MC33880 is not set | ||||
| # CONFIG_GPIO_MCP23S08 is not set | ||||
| # CONFIG_GPIO_XILINX is not set | ||||
| 
 | ||||
| # FIXME: Why? | ||||
| 
 | ||||
|  | ||||
| @ -514,6 +514,7 @@ CONFIG_SND_SOC_INTEL_BYT_RT5640_MACH=m | ||||
| CONFIG_SND_SOC_INTEL_BYT_MAX98090_MACH=m | ||||
| CONFIG_SND_SOC_INTEL_BYTCR_RT5640_MACH=m | ||||
| CONFIG_SND_SOC_INTEL_CHT_BSW_RT5672_MACH=m | ||||
| CONFIG_SND_SOC_INTEL_CHT_BSW_RT5645_MACH=m | ||||
| 
 | ||||
| 
 | ||||
| 
 | ||||
|  | ||||
| @ -28,7 +28,7 @@ Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> | ||||
|  4 files changed, 104 insertions(+), 69 deletions(-) | ||||
| 
 | ||||
| diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
 | ||||
| index 9d7a7155bf02..d04ed2b2728e 100644
 | ||||
| index 24cc36a9f3ff..8e1ee6d56d6a 100644
 | ||||
| --- a/drivers/gpu/drm/i915/i915_drv.h
 | ||||
| +++ b/drivers/gpu/drm/i915/i915_drv.h
 | ||||
| @@ -60,6 +60,35 @@
 | ||||
| @ -67,7 +67,7 @@ index 9d7a7155bf02..d04ed2b2728e 100644 | ||||
|  enum pipe { | ||||
|  	INVALID_PIPE = -1, | ||||
|  	PIPE_A = 0, | ||||
| @@ -2309,6 +2338,7 @@ struct i915_params {
 | ||||
| @@ -2317,6 +2346,7 @@ struct i915_params {
 | ||||
|  	bool disable_vtd_wa; | ||||
|  	int use_mmio_flip; | ||||
|  	bool mmio_debug; | ||||
|  | ||||
| @ -69,7 +69,7 @@ Summary: The Linux kernel | ||||
| # The rc snapshot level | ||||
| %define rcrev 0 | ||||
| # The git snapshot level | ||||
| %define gitrev 2 | ||||
| %define gitrev 3 | ||||
| # Set rpm version accordingly | ||||
| %define rpmversion 3.%{upstream_sublevel}.0 | ||||
| %endif | ||||
| @ -2215,6 +2215,9 @@ fi | ||||
| #                                    ||----w | | ||||
| #                                    ||     || | ||||
| %changelog | ||||
| * Thu Feb 12 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git3.1 | ||||
| - Linux v3.19-4020-gce01e871a1d4 | ||||
| 
 | ||||
| * Wed Feb 11 2015 Josh Boyer <jwboyer@fedoraproject.org> - 3.20.0-0.rc0.git2.1 | ||||
| - Linux v3.19-2595-gc5ce28df0e7c | ||||
| 
 | ||||
|  | ||||
| @ -9,7 +9,7 @@ Upstream-status: Fedora mustard (might be worth dropping...) | ||||
|  1 file changed, 6 insertions(+), 1 deletion(-) | ||||
| 
 | ||||
| diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
 | ||||
| index 05ea0d49a3a3..95f18e07491b 100644
 | ||||
| index 6b78476d04bb..d490145a317d 100644
 | ||||
| --- a/drivers/scsi/sd.c
 | ||||
| +++ b/drivers/scsi/sd.c
 | ||||
| @@ -2750,13 +2750,18 @@ static int sd_try_extended_inquiry(struct scsi_device *sdp)
 | ||||
|  | ||||
| @ -9,10 +9,10 @@ Upstream-status: Fedora mustard | ||||
|  1 file changed, 17 insertions(+), 7 deletions(-) | ||||
| 
 | ||||
| diff --git a/drivers/video/console/fbcon.c b/drivers/video/console/fbcon.c
 | ||||
| index ea437245562e..eefa9c45d2e1 100644
 | ||||
| index b97210671a81..2d12ad82fe75 100644
 | ||||
| --- a/drivers/video/console/fbcon.c
 | ||||
| +++ b/drivers/video/console/fbcon.c
 | ||||
| @@ -637,13 +637,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
 | ||||
| @@ -634,13 +634,15 @@ static void fbcon_prepare_logo(struct vc_data *vc, struct fb_info *info,
 | ||||
|  		kfree(save); | ||||
|  	} | ||||
|   | ||||
| @ -35,7 +35,7 @@ index ea437245562e..eefa9c45d2e1 100644 | ||||
|  	} | ||||
|  } | ||||
|  #endif /* MODULE */ | ||||
| @@ -3624,6 +3626,14 @@ static int __init fb_console_init(void)
 | ||||
| @@ -3620,6 +3622,14 @@ static int __init fb_console_init(void)
 | ||||
|  	return 0; | ||||
|  } | ||||
|   | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user