forked from rpms/kernel
		
	Linux v4.8-11417-g24532f7
This commit is contained in:
		
							parent
							
								
									4447ea8ed0
								
							
						
					
					
						commit
						9ed1be95a8
					
				| @ -1,76 +0,0 @@ | ||||
| From b490a8537df60d449199e162417da74ee9262515 Mon Sep 17 00:00:00 2001 | ||||
| From: Yuta Kobayashi <alu.ula@outlook.com> | ||||
| Date: Fri, 12 Aug 2016 07:49:17 +0000 | ||||
| Subject: [PATCH] HID: microsoft: Add Surface 4 type cover pro 4 (JP) | ||||
| 
 | ||||
| Adding support for the Microsoft Surface 4 Type Cover Pro (JP). | ||||
| 
 | ||||
| Signed-off-by: Yuta Kobayashi <alu.ula@outlook.com> | ||||
| Signed-off-by: Jiri Kosina <jkosina@suse.cz> | ||||
| ---
 | ||||
|  drivers/hid/hid-core.c          | 2 ++ | ||||
|  drivers/hid/hid-ids.h           | 1 + | ||||
|  drivers/hid/hid-microsoft.c     | 2 ++ | ||||
|  drivers/hid/usbhid/hid-quirks.c | 1 + | ||||
|  4 files changed, 6 insertions(+) | ||||
| 
 | ||||
| diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c
 | ||||
| index ed10d4f..45400de 100644
 | ||||
| --- a/drivers/hid/hid-core.c
 | ||||
| +++ b/drivers/hid/hid-core.c
 | ||||
| @@ -727,6 +727,7 @@ static void hid_scan_collection(struct hid_parser *parser, unsigned type)
 | ||||
|  	    (hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3 || | ||||
|  	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2 || | ||||
|  	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP || | ||||
| +	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP ||
 | ||||
|  	     hid->product == USB_DEVICE_ID_MS_TYPE_COVER_3 || | ||||
|  	     hid->product == USB_DEVICE_ID_MS_POWER_COVER) && | ||||
|  	    hid->group == HID_GROUP_MULTITOUCH) | ||||
| @@ -1982,6 +1983,7 @@ static const struct hid_device_id hid_have_special_driver[] = {
 | ||||
|  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3) }, | ||||
|  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2) }, | ||||
|  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP) }, | ||||
| +	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP) },
 | ||||
|  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3) }, | ||||
|  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_7K) }, | ||||
|  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_DIGITAL_MEDIA_600) }, | ||||
| diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h
 | ||||
| index da1c58e..3466f0d 100644
 | ||||
| --- a/drivers/hid/hid-ids.h
 | ||||
| +++ b/drivers/hid/hid-ids.h
 | ||||
| @@ -713,6 +713,7 @@
 | ||||
|  #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3    0x07dc | ||||
|  #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2  0x07e2 | ||||
|  #define USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP 0x07dd | ||||
| +#define USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP 0x07e9
 | ||||
|  #define USB_DEVICE_ID_MS_TYPE_COVER_3    0x07de | ||||
|  #define USB_DEVICE_ID_MS_POWER_COVER     0x07da | ||||
| 
 | ||||
| diff --git a/drivers/hid/hid-microsoft.c b/drivers/hid/hid-microsoft.c
 | ||||
| index e924d55..56c586f 100644
 | ||||
| --- a/drivers/hid/hid-microsoft.c
 | ||||
| +++ b/drivers/hid/hid-microsoft.c
 | ||||
| @@ -288,6 +288,8 @@ static const struct hid_device_id ms_devices[] = {
 | ||||
|  		.driver_data = MS_HIDINPUT }, | ||||
|  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP), | ||||
|  		.driver_data = MS_HIDINPUT }, | ||||
| +	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP),
 | ||||
| +		.driver_data = MS_HIDINPUT },
 | ||||
|  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3), | ||||
|  		.driver_data = MS_HIDINPUT }, | ||||
|  	{ HID_USB_DEVICE(USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER), | ||||
| diff --git a/drivers/hid/usbhid/hid-quirks.c b/drivers/hid/usbhid/hid-quirks.c
 | ||||
| index b4b8c6a..1fccffd 100644
 | ||||
| --- a/drivers/hid/usbhid/hid-quirks.c
 | ||||
| +++ b/drivers/hid/usbhid/hid-quirks.c
 | ||||
| @@ -98,6 +98,7 @@ static const struct hid_blacklist {
 | ||||
|  	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3, HID_QUIRK_NO_INIT_REPORTS }, | ||||
|  	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_2, HID_QUIRK_NO_INIT_REPORTS }, | ||||
|  	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_3_JP, HID_QUIRK_NO_INIT_REPORTS }, | ||||
| +	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_PRO_4_JP, HID_QUIRK_NO_INIT_REPORTS },
 | ||||
|  	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_TYPE_COVER_3, HID_QUIRK_NO_INIT_REPORTS }, | ||||
|  	{ USB_VENDOR_ID_MICROSOFT, USB_DEVICE_ID_MS_POWER_COVER, HID_QUIRK_NO_INIT_REPORTS }, | ||||
|  	{ USB_VENDOR_ID_MSI, USB_DEVICE_ID_MSI_GT683R_LED_PANEL, HID_QUIRK_NO_INIT_REPORTS }, | ||||
| -- 
 | ||||
| 2.7.4 | ||||
| 
 | ||||
| @ -1,41 +0,0 @@ | ||||
| From: Dan Carpenter <dan.carpenter@oracle.com> | ||||
| Date: 2016-09-15 13:44:56 | ||||
| Subject: [patch v2] arcmsr: buffer overflow in arcmsr_iop_message_xfer() | ||||
| 
 | ||||
| We need to put an upper bound on "user_len" so the memcpy() doesn't | ||||
| overflow. | ||||
| 
 | ||||
| Reported-by: Marco Grassi <marco.gra@gmail.com> | ||||
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> | ||||
| Reviewed-by: Tomas Henzl <thenzl@redhat.com> | ||||
| 
 | ||||
| diff --git a/drivers/scsi/arcmsr/arcmsr_hba.c b/drivers/scsi/arcmsr/arcmsr_hba.c
 | ||||
| index 7640498..110eca9 100644
 | ||||
| --- a/drivers/scsi/arcmsr/arcmsr_hba.c
 | ||||
| +++ b/drivers/scsi/arcmsr/arcmsr_hba.c
 | ||||
| @@ -2388,7 +2388,8 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
 | ||||
|  	} | ||||
|  	case ARCMSR_MESSAGE_WRITE_WQBUFFER: { | ||||
|  		unsigned char *ver_addr; | ||||
| -		int32_t user_len, cnt2end;
 | ||||
| +		uint32_t user_len;
 | ||||
| +		int32_t cnt2end;
 | ||||
|  		uint8_t *pQbuffer, *ptmpuserbuffer; | ||||
|  		ver_addr = kmalloc(ARCMSR_API_DATA_BUFLEN, GFP_ATOMIC); | ||||
|  		if (!ver_addr) { | ||||
| @@ -2397,6 +2398,11 @@ static int arcmsr_iop_message_xfer(struct AdapterControlBlock *acb,
 | ||||
|  		} | ||||
|  		ptmpuserbuffer = ver_addr; | ||||
|  		user_len = pcmdmessagefld->cmdmessage.Length; | ||||
| +		if (user_len > ARCMSR_API_DATA_BUFLEN) {
 | ||||
| +			retvalue = ARCMSR_MESSAGE_FAIL;
 | ||||
| +			kfree(ver_addr);
 | ||||
| +			goto message_out;
 | ||||
| +		}
 | ||||
|  		memcpy(ptmpuserbuffer, | ||||
|  			pcmdmessagefld->messagedatabuffer, user_len); | ||||
|  		spin_lock_irqsave(&acb->wqbuffer_lock, flags); | ||||
| --
 | ||||
| To unsubscribe from this list: send the line "unsubscribe linux-scsi" in | ||||
| the body of a message to majordomo@vger.kernel.org | ||||
| More majordomo info at  http://vger.kernel.org/majordomo-info.html | ||||
| @ -1,4 +1,4 @@ | ||||
| From a2858804c7f5f4585b718543236b7ba3b3ec813a Mon Sep 17 00:00:00 2001 | ||||
| From f06dd7d37ae66a4441b1c17f55e26f8bf8349531 Mon Sep 17 00:00:00 2001 | ||||
| From: Peter Robinson <pbrobinson@gmail.com> | ||||
| Date: Mon, 29 Aug 2016 09:14:15 +0100 | ||||
| Subject: [PATCH] ARM: bcm283x: Add devicetree for the Raspberry Pi 3. | ||||
| @ -10,23 +10,21 @@ Rebased to the patch that went upstream for ARM64 | ||||
| 
 | ||||
| Signed-off-by: Peter Robinson <pbrobinson@gmail.com> | ||||
| ---
 | ||||
|  arch/arm/boot/dts/Makefile            |  3 +- | ||||
|  arch/arm/boot/dts/Makefile            |  1 + | ||||
|  arch/arm/boot/dts/bcm2837-rpi-3-b.dts | 30 ++++++++++++++ | ||||
|  arch/arm/boot/dts/bcm2837.dtsi        | 76 +++++++++++++++++++++++++++++++++++ | ||||
|  3 files changed, 108 insertions(+), 1 deletion(-) | ||||
|  3 files changed, 107 insertions(+) | ||||
|  create mode 100644 arch/arm/boot/dts/bcm2837-rpi-3-b.dts | ||||
|  create mode 100644 arch/arm/boot/dts/bcm2837.dtsi | ||||
| 
 | ||||
| diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
 | ||||
| index faacd52..ec41888 100644
 | ||||
| index befcd26..68993e2 100644
 | ||||
| --- a/arch/arm/boot/dts/Makefile
 | ||||
| +++ b/arch/arm/boot/dts/Makefile
 | ||||
| @@ -69,7 +69,8 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
 | ||||
|  	bcm2835-rpi-b-rev2.dtb \ | ||||
|  	bcm2835-rpi-b-plus.dtb \ | ||||
| @@ -71,6 +71,7 @@ dtb-$(CONFIG_ARCH_BCM2835) += \
 | ||||
|  	bcm2835-rpi-a-plus.dtb \ | ||||
| -	bcm2836-rpi-2-b.dtb
 | ||||
| +	bcm2836-rpi-2-b.dtb \
 | ||||
|  	bcm2836-rpi-2-b.dtb \ | ||||
|  	bcm2835-rpi-zero.dtb | ||||
| +	bcm2837-rpi-3-b.dtb
 | ||||
|  dtb-$(CONFIG_ARCH_BCM_5301X) += \ | ||||
|  	bcm4708-asus-rt-ac56u.dtb \ | ||||
| @ -150,4 +148,5 @@ index 0000000..8216bbb | ||||
| +	interrupts = <8>;
 | ||||
| +};
 | ||||
| -- 
 | ||||
| 2.9.3 | ||||
| 2.7.4 | ||||
| 
 | ||||
|  | ||||
| @ -136,6 +136,7 @@ CONFIG_ARCH_BCM2835=y | ||||
| # CONFIG_ARCH_BCM_21664 is not set | ||||
| # CONFIG_ARCH_BCM_63XX is not set | ||||
| # CONFIG_ARCH_BCM_23550 is not set | ||||
| # CONFIG_ARCH_BCM_53573 is not set | ||||
| # CONFIG_ARCH_BRCMSTB is not set | ||||
| # CONFIG_ARCH_BERLIN is not set | ||||
| # BCM 283x | ||||
| @ -240,6 +241,7 @@ CONFIG_ROCKCHIP_MBOX=y | ||||
| # CONFIG_PHY_ROCKCHIP_INNO_USB2 is not set | ||||
| # CONFIG_PHY_ROCKCHIP_PCIE is not set | ||||
| # CONFIG_PHY_ROCKCHIP_TYPEC is not set | ||||
| # CONFIG_PCIE_ROCKCHIP is not set | ||||
| 
 | ||||
| # Tegra | ||||
| CONFIG_TEGRA_MC=y | ||||
|  | ||||
| @ -23,6 +23,7 @@ CONFIG_ARCH_THUNDER=y | ||||
| # CONFIG_ARCH_ZYNQMP is not set | ||||
| # CONFIG_ARCH_UNIPHIER is not set | ||||
| # CONFIG_ARCH_LG1K is not set | ||||
| # CONFIG_ARCH_ZX is not set | ||||
| 
 | ||||
| # Erratum | ||||
| CONFIG_ARM64_ERRATUM_826319=y | ||||
| @ -150,6 +151,7 @@ CONFIG_I2C_XGENE_SLIMPRO=m | ||||
| CONFIG_XGENE_SLIMPRO_MBOX=m | ||||
| CONFIG_MDIO_XGENE=m | ||||
| # CONFIG_SENSORS_XGENE is not set | ||||
| CONFIG_XGENE_PMU=y | ||||
| 
 | ||||
| # AMD Seattle | ||||
| CONFIG_NET_SB1000=y | ||||
| @ -271,6 +273,7 @@ CONFIG_QCOM_COINCELL=m | ||||
| # CONFIG_SENSORS_LTC2978_REGULATOR is not set | ||||
| # CONFIG_QCOM_Q6V5_PIL is not set | ||||
| # CONFIG_QCOM_WCNSS_PIL is not set | ||||
| # CONFIG_QCOM_EBI2 is not set | ||||
| 
 | ||||
| # mvebu | ||||
| # CONFIG_MV_XOR_V2 is not set | ||||
| @ -287,6 +290,7 @@ CONFIG_THUNDER_NIC_BGX=m | ||||
| CONFIG_THUNDER_NIC_RGX=m | ||||
| # CONFIG_LIQUIDIO is not set | ||||
| # CONFIG_SPI_THUNDERX is not set | ||||
| # CONFIG_I2C_THUNDERX is not set | ||||
| 
 | ||||
| CONFIG_SATA_AHCI_PLATFORM=y | ||||
| CONFIG_SATA_AHCI_SEATTLE=m | ||||
|  | ||||
| @ -770,6 +770,7 @@ CONFIG_R8188EU=m | ||||
| # CONFIG_QCOM_SPMI_TEMP_ALARM is not set | ||||
| # CONFIG_SND_SOC_APQ8016_SBC is not set | ||||
| # CONFIG_SND_SOC_TAS571X is not set | ||||
| # CONFIG_QCOM_EBI2 is not set | ||||
| 
 | ||||
| # CONFIG_VFIO_PLATFORM_AMDXGBE_RESET is not set | ||||
| 
 | ||||
|  | ||||
| @ -115,6 +115,7 @@ CONFIG_HOTPLUG_PCI=y | ||||
| CONFIG_HOTPLUG_PCI_PCIE=y | ||||
| # CONFIG_PCIE_DW_PLAT is not set | ||||
| CONFIG_PCIE_DPC=y | ||||
| CONFIG_PCIE_PTM=y | ||||
| 
 | ||||
| # CONFIG_SGI_IOC4 is not set | ||||
| 
 | ||||
| @ -464,6 +465,7 @@ CONFIG_SCSI_DH_RDAC=m | ||||
| CONFIG_SCSI_DH_HP_SW=m | ||||
| CONFIG_SCSI_DH_EMC=m | ||||
| CONFIG_SCSI_DH_ALUA=m | ||||
| CONFIG_SCSI_SMARTPQI=m | ||||
| 
 | ||||
| # | ||||
| # SCSI support type (disk, tape, CD-ROM) | ||||
| @ -2472,6 +2474,7 @@ CONFIG_KEYBOARD_ATKBD=y | ||||
| # CONFIG_KEYBOARD_TCA8418 is not set | ||||
| # CONFIG_KEYBOARD_OMAP4 is not set | ||||
| # CONFIG_KEYBOARD_CAP11XX is not set | ||||
| # CONFIG_KEYBOARD_ADC is not set | ||||
| CONFIG_INPUT_MOUSE=y | ||||
| CONFIG_MOUSE_PS2=y | ||||
| # CONFIG_MOUSE_PS2_TOUCHKIT is not set | ||||
| @ -2583,6 +2586,7 @@ CONFIG_TOUCHSCREEN_ZFORCE=m | ||||
| # CONFIG_TOUCHSCREEN_ROHM_BU21023 is not set | ||||
| # CONFIG_TOUCHSCREEN_TSC2004 is not set | ||||
| # CONFIG_TOUCHSCREEN_MELFAS_MIP4 is not set | ||||
| # CONFIG_TOUCHSCREEN_EKTF2127 is not set | ||||
| 
 | ||||
| CONFIG_INPUT_MISC=y | ||||
| CONFIG_INPUT_E3X0_BUTTON=m | ||||
| @ -2607,6 +2611,7 @@ CONFIG_INPUT_MPU3050=m | ||||
| CONFIG_INPUT_KXTJ9=m | ||||
| # CONFIG_INPUT_KXTJ9_POLLED_MODE is not set | ||||
| # CONFIG_INPUT_PWM_BEEPER is not set | ||||
| # CONFIG_INPUT_GPIO_DECODER is not set | ||||
| 
 | ||||
| CONFIG_RMI4_CORE=m | ||||
| CONFIG_RMI4_I2C=m | ||||
| @ -4579,10 +4584,13 @@ CONFIG_MFD_VIPERBOARD=m | ||||
| # CONFIG_MFD_WM8350 is not set | ||||
| # CONFIG_MFD_WM8400 is not set | ||||
| # CONFIG_MFD_WM8994 is not set | ||||
| # CONFIG_MFD_AC100 is not set | ||||
| # CONFIG_MFD_EXYNOS_LPASS is not set | ||||
| # CONFIG_TPS6507X is not set | ||||
| # CONFIG_TS4800_IRQ is not set | ||||
| # CONFIG_TWL4030_CORE is not set | ||||
| # CONFIG_TWL6040_CORE is not set | ||||
| # CONFIG_QCOM_EBI2 is not set | ||||
| 
 | ||||
| # | ||||
| # File systems | ||||
|  | ||||
| @ -23,6 +23,8 @@ CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y | ||||
| 
 | ||||
| CONFIG_MLX_PLATFORM=m | ||||
| 
 | ||||
| CONFIG_INTEL_ISH_HID=m | ||||
| 
 | ||||
| # https://lists.fedoraproject.org/pipermail/kernel/2013-November/004601.html | ||||
| CONFIG_NR_CPUS=1024 | ||||
| CONFIG_PHYSICAL_START=0x1000000 | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| From 277aa4c25655e8f746f02879d26298772244958a Mon Sep 17 00:00:00 2001 | ||||
| From 11aa129d33635fb33304b6e9b945e502f5ba707a Mon Sep 17 00:00:00 2001 | ||||
| From: Peter Robinson <pbrobinson@gmail.com> | ||||
| Date: Thu, 17 Mar 2016 15:19:04 +0000 | ||||
| Subject: [PATCH] geekbox v4 patchset | ||||
| @ -13,10 +13,10 @@ Subject: [PATCH] geekbox v4 patchset | ||||
|  create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts | ||||
| 
 | ||||
| diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
 | ||||
| index 715d960..7cfadac 100644
 | ||||
| index 55f388f..989a039 100644
 | ||||
| --- a/Documentation/devicetree/bindings/arm/rockchip.txt
 | ||||
| +++ b/Documentation/devicetree/bindings/arm/rockchip.txt
 | ||||
| @@ -95,6 +95,15 @@ Rockchip platforms device tree bindings
 | ||||
| @@ -99,6 +99,15 @@ Rockchip platforms device tree bindings
 | ||||
|      Required root node properties: | ||||
|        - compatible = "mqmaker,miqi", "rockchip,rk3288"; | ||||
|   | ||||
| @ -33,12 +33,13 @@ index 715d960..7cfadac 100644 | ||||
|      Required root node properties: | ||||
|        - compatible = "rockchip,rk3368-evb-act8846", "rockchip,rk3368"; | ||||
| diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
 | ||||
| index 7037a16..e002ebe 100644
 | ||||
| index 87669f6..9aec54e 100644
 | ||||
| --- a/arch/arm64/boot/dts/rockchip/Makefile
 | ||||
| +++ b/arch/arm64/boot/dts/rockchip/Makefile
 | ||||
| @@ -1,5 +1,6 @@
 | ||||
| @@ -1,6 +1,7 @@
 | ||||
|  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb | ||||
|  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb | ||||
|  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb | ||||
| +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox-landingship.dtb
 | ||||
|  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb | ||||
|  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb | ||||
| @ -120,7 +121,7 @@ index 0000000..a28ace9 | ||||
| +	status = "okay";
 | ||||
| +};
 | ||||
| diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
 | ||||
| index b56b720..5ea68c4 100644
 | ||||
| index eed1ef6..18e2b77 100644
 | ||||
| --- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
 | ||||
| +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
 | ||||
| @@ -52,7 +52,7 @@
 | ||||
| @ -133,5 +134,5 @@ index b56b720..5ea68c4 100644 | ||||
|  		reg = <0x0 0x0 0x0 0x40000000>; | ||||
|  	}; | ||||
| -- 
 | ||||
| 2.5.5 | ||||
| 2.7.4 | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										2
									
								
								gitrev
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gitrev
									
									
									
									
									
								
							| @ -1 +1 @@ | ||||
| 3477d168ba61c5b0ca42d3d4642f3463609a5417 | ||||
| 24532f768121b07b16178ffb40442ece43365cbd | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| From a9488dbeccf188f0bd83b9d5704892f2c0f97fdc Mon Sep 17 00:00:00 2001 | ||||
| From 22e118d8d8dd13cda14973e28e198ec76c6a9a3b Mon Sep 17 00:00:00 2001 | ||||
| From: Roland McGrath <roland@redhat.com> | ||||
| Date: Mon, 6 Oct 2008 23:03:03 -0700 | ||||
| Subject: [PATCH] kbuild: AFTER_LINK | ||||
| @ -21,10 +21,10 @@ Signed-off-by: Roland McGrath <roland@redhat.com> | ||||
|  7 files changed, 17 insertions(+), 7 deletions(-) | ||||
| 
 | ||||
| diff --git a/arch/arm64/kernel/vdso/Makefile b/arch/arm64/kernel/vdso/Makefile
 | ||||
| index b467fd0..feeff5e 100644
 | ||||
| index 62c84f7..f44236a 100644
 | ||||
| --- a/arch/arm64/kernel/vdso/Makefile
 | ||||
| +++ b/arch/arm64/kernel/vdso/Makefile
 | ||||
| @@ -55,7 +55,8 @@ $(obj-vdso): %.o: %.S FORCE
 | ||||
| @@ -54,7 +54,8 @@ $(obj-vdso): %.o: %.S FORCE
 | ||||
|   | ||||
|  # Actual build commands | ||||
|  quiet_cmd_vdsold = VDSOL   $@ | ||||
| @ -35,10 +35,10 @@ index b467fd0..feeff5e 100644 | ||||
|        cmd_vdsoas = $(CC) $(a_flags) -c -o $@ $< | ||||
|   | ||||
| diff --git a/arch/powerpc/kernel/vdso32/Makefile b/arch/powerpc/kernel/vdso32/Makefile
 | ||||
| index 6abffb7..7b103bb 100644
 | ||||
| index 78a7449..c9592c0 100644
 | ||||
| --- a/arch/powerpc/kernel/vdso32/Makefile
 | ||||
| +++ b/arch/powerpc/kernel/vdso32/Makefile
 | ||||
| @@ -43,7 +43,8 @@ $(obj-vdso32): %.o: %.S
 | ||||
| @@ -44,7 +44,8 @@ $(obj-vdso32): %.o: %.S FORCE
 | ||||
|   | ||||
|  # actual build commands | ||||
|  quiet_cmd_vdso32ld = VDSO32L $@ | ||||
| @ -49,24 +49,24 @@ index 6abffb7..7b103bb 100644 | ||||
|        cmd_vdso32as = $(CROSS32CC) $(a_flags) -c -o $@ $< | ||||
|   | ||||
| diff --git a/arch/powerpc/kernel/vdso64/Makefile b/arch/powerpc/kernel/vdso64/Makefile
 | ||||
| index 8c8f2ae..a743ebe 100644
 | ||||
| index 31107bf..96aded3 100644
 | ||||
| --- a/arch/powerpc/kernel/vdso64/Makefile
 | ||||
| +++ b/arch/powerpc/kernel/vdso64/Makefile
 | ||||
| @@ -36,7 +36,8 @@ $(obj-vdso64): %.o: %.S
 | ||||
| @@ -33,7 +33,8 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE
 | ||||
|   | ||||
|  # actual build commands | ||||
|  quiet_cmd_vdso64ld = VDSO64L $@ | ||||
| -      cmd_vdso64ld = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^)
 | ||||
| +      cmd_vdso64ld = $(CC) $(c_flags) -o $@ -Wl,-T$(filter %.lds,$^) $(filter %.o,$^) \
 | ||||
| +		     $(if $(AFTER_LINK),; $(AFTER_LINK))
 | ||||
|  quiet_cmd_vdso64as = VDSO64A $@ | ||||
|        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< | ||||
| +		    $(if $(AFTER_LINK),; $(AFTER_LINK))
 | ||||
|   | ||||
|  # install commands for the unstripped file | ||||
|  quiet_cmd_vdso_install = INSTALL $@ | ||||
| diff --git a/arch/s390/kernel/vdso32/Makefile b/arch/s390/kernel/vdso32/Makefile
 | ||||
| index ee8a18e..63e33fa 100644
 | ||||
| index 6cc9478..94fb536 100644
 | ||||
| --- a/arch/s390/kernel/vdso32/Makefile
 | ||||
| +++ b/arch/s390/kernel/vdso32/Makefile
 | ||||
| @@ -43,7 +43,8 @@ $(obj-vdso32): %.o: %.S
 | ||||
| @@ -46,7 +46,8 @@ $(obj-vdso32): %.o: %.S
 | ||||
|   | ||||
|  # actual build commands | ||||
|  quiet_cmd_vdso32ld = VDSO32L $@ | ||||
| @ -77,10 +77,10 @@ index ee8a18e..63e33fa 100644 | ||||
|        cmd_vdso32as = $(CC) $(a_flags) -c -o $@ $< | ||||
|   | ||||
| diff --git a/arch/s390/kernel/vdso64/Makefile b/arch/s390/kernel/vdso64/Makefile
 | ||||
| index c4b03f9..550450f 100644
 | ||||
| index 2d54c18..a0e3e9d 100644
 | ||||
| --- a/arch/s390/kernel/vdso64/Makefile
 | ||||
| +++ b/arch/s390/kernel/vdso64/Makefile
 | ||||
| @@ -43,7 +43,8 @@ $(obj-vdso64): %.o: %.S
 | ||||
| @@ -46,7 +46,8 @@ $(obj-vdso64): %.o: %.S
 | ||||
|   | ||||
|  # actual build commands | ||||
|  quiet_cmd_vdso64ld = VDSO64L $@ | ||||
| @ -91,10 +91,10 @@ index c4b03f9..550450f 100644 | ||||
|        cmd_vdso64as = $(CC) $(a_flags) -c -o $@ $< | ||||
|   | ||||
| diff --git a/arch/x86/entry/vdso/Makefile b/arch/x86/entry/vdso/Makefile
 | ||||
| index 265c0ed..fd90c7d 100644
 | ||||
| index d540966..eeb47b6 100644
 | ||||
| --- a/arch/x86/entry/vdso/Makefile
 | ||||
| +++ b/arch/x86/entry/vdso/Makefile
 | ||||
| @@ -159,8 +159,9 @@ $(obj)/vdso32.so.dbg: FORCE \
 | ||||
| @@ -167,8 +167,9 @@ $(obj)/vdso32.so.dbg: FORCE \
 | ||||
|  quiet_cmd_vdso = VDSO    $@ | ||||
|        cmd_vdso = $(CC) -nostdlib -o $@ \ | ||||
|  		       $(VDSO_LDFLAGS) $(VDSO_LDFLAGS_$(filter %.lds,$(^F))) \ | ||||
| @ -107,7 +107,7 @@ index 265c0ed..fd90c7d 100644 | ||||
|  VDSO_LDFLAGS = -fPIC -shared $(call cc-ldoption, -Wl$(comma)--hash-style=both) \ | ||||
|  	$(call cc-ldoption, -Wl$(comma)--build-id) -Wl,-Bsymbolic $(LTO_CFLAGS) | ||||
| diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh
 | ||||
| index dacf71a..72cbefd 100755
 | ||||
| index 4f727eb..7f73bee 100755
 | ||||
| --- a/scripts/link-vmlinux.sh
 | ||||
| +++ b/scripts/link-vmlinux.sh
 | ||||
| @@ -65,6 +65,10 @@ vmlinux_link()
 | ||||
| @ -122,5 +122,5 @@ index dacf71a..72cbefd 100755 | ||||
|   | ||||
|   | ||||
| -- 
 | ||||
| 2.5.0 | ||||
| 2.7.4 | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										11
									
								
								kernel.spec
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								kernel.spec
									
									
									
									
									
								
							| @ -69,7 +69,7 @@ Summary: The Linux kernel | ||||
| # The rc snapshot level | ||||
| %define rcrev 0 | ||||
| # The git snapshot level | ||||
| %define gitrev 4 | ||||
| %define gitrev 5 | ||||
| # Set rpm version accordingly | ||||
| %define rpmversion 4.%{upstream_sublevel}.0 | ||||
| %endif | ||||
| @ -603,9 +603,6 @@ Patch665: netfilter-x_tables-deal-with-bogus-nextoffset-values.patch | ||||
| #rhbz 1200901 (There should be something better upstream at some point) | ||||
| Patch842: qxl-reapply-cursor-after-SetCrtc-calls.patch | ||||
| 
 | ||||
| # From kernel list, currently in linux-next | ||||
| Patch845: HID-microsoft-Add-Surface-4-type-cover-pro-4-JP.patch | ||||
| 
 | ||||
| #rhbz 1360688 | ||||
| Patch847: rc-core-fix-repeat-events.patch | ||||
| 
 | ||||
| @ -615,9 +612,6 @@ Patch848: 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch | ||||
| #ongoing complaint, full discussion delayed until ksummit/plumbers | ||||
| Patch849: 0001-iio-Use-event-header-from-kernel-tree.patch | ||||
| 
 | ||||
| #CVE-2016-7425 rhbz 1377330 1377331 | ||||
| Patch850: arcmsr-buffer-overflow-in-archmsr_iop_message_xfer.patch | ||||
| 
 | ||||
| # Fix came in locally | ||||
| Patch851: 0001-drivers-net-phy-Correct-duplicate-MDIO_XGENE-entry.patch | ||||
| 
 | ||||
| @ -2157,6 +2151,9 @@ fi | ||||
| # | ||||
| # | ||||
| %changelog | ||||
| * Mon Oct 10 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git5.1 | ||||
| - Linux v4.8-11417-g24532f7 | ||||
| 
 | ||||
| * Fri Oct 07 2016 Laura Abbott <labbott@redhat.com> - 4.9.0-0.rc0.git4.1 | ||||
| - Linux v4.8-9431-g3477d16 | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user