diff options
author | Justin M. Forbes <jforbes@redhat.com> | 2016-07-28 13:47:17 -0500 |
---|---|---|
committer | Justin M. Forbes <jforbes@redhat.com> | 2016-07-28 13:47:17 -0500 |
commit | 909ce5cc9eb9da4ed86129ede234517183376a1c (patch) | |
tree | 0f66c216c3ee3a36a328098b5df85f40a2273aea | |
parent | 04b67efd0a101a2e343752ea546385e066631de8 (diff) | |
download | kernel-909ce5cc9eb9da4ed86129ede234517183376a1c.tar.gz kernel-909ce5cc9eb9da4ed86129ede234517183376a1c.tar.xz kernel-909ce5cc9eb9da4ed86129ede234517183376a1c.zip |
Linux v4.7-5906-g194dc87
-rw-r--r-- | config-arm64 | 3 | ||||
-rw-r--r-- | config-armv7-generic | 1 | ||||
-rw-r--r-- | config-generic | 20 | ||||
-rw-r--r-- | config-powerpc64-generic | 1 | ||||
-rw-r--r-- | gitrev | 2 | ||||
-rw-r--r-- | kernel.spec | 5 | ||||
-rw-r--r-- | sources | 2 |
7 files changed, 31 insertions, 3 deletions
diff --git a/config-arm64 b/config-arm64 index 0ac88943c..d76849426 100644 --- a/config-arm64 +++ b/config-arm64 @@ -136,6 +136,7 @@ CONFIG_PCI_XGENE=y CONFIG_PCI_XGENE_MSI=y CONFIG_I2C_XGENE_SLIMPRO=m CONFIG_XGENE_SLIMPRO_MBOX=m +CONFIG_MDIO_XGENE=m # AMD Seattle CONFIG_NET_SB1000=y @@ -159,6 +160,8 @@ CONFIG_RESET_HISI=y CONFIG_MFD_HI655X_PMIC=m CONFIG_DRM_HISI_KIRIN=m CONFIG_HISI_KIRIN_DW_DSI=m +CONFIG_MDIO_HISI_FEMAC=m +CONFIG_INPUT_HISI_POWERKEY=m # Tegra CONFIG_ARCH_TEGRA_132_SOC=y diff --git a/config-armv7-generic b/config-armv7-generic index dbbcbc81e..814036a66 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -722,6 +722,7 @@ CONFIG_R8188EU=m # CONFIG_CAN_TI_HECC is not set # CONFIG_CAN_FLEXCAN is not set # CONFIG_CAN_RCAR is not set +# CONFIG_CAN_RCAR_CANFD is not set # Needs work/investigation # CONFIG_ARM_KPROBES_TEST is not set diff --git a/config-generic b/config-generic index fa6038b86..1ac079708 100644 --- a/config-generic +++ b/config-generic @@ -526,6 +526,8 @@ CONFIG_SCSI_UFSHCD=m CONFIG_SCSI_UFSHCD_PCI=m # CONFIG_SCSI_UFSHCD_PLATFORM is not set +# CONFIG_SCSI_UFS_DWC_TC_PCI is not set + CONFIG_SCSI_MVUMI=m CONFIG_SCSI_OSD_INITIATOR=m @@ -788,6 +790,7 @@ CONFIG_TCP_CONG_CDG=m CONFIG_TCP_CONG_LP=m CONFIG_TCP_CONG_SCALABLE=m CONFIG_TCP_CONG_VEGAS=m +CONFIG_TCP_CONG_NV=m CONFIG_TCP_CONG_VENO=m CONFIG_TCP_CONG_WESTWOOD=m CONFIG_TCP_CONG_YEAH=m @@ -1260,6 +1263,7 @@ CONFIG_NET_CLS_FLOWER=m CONFIG_NET_CLS_FLOW=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_IND=y +CONFIG_NET_CLS_MATCHALL=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_ROUTE=y CONFIG_NET_CLS_RSVP=m @@ -1674,6 +1678,9 @@ CONFIG_NATIONAL_PHY=m CONFIG_ICPLUS_PHY=m CONFIG_BCM63XX_PHY=m CONFIG_BCM7XXX_PHY=m +CONFIG_INTEL_XWAY_PHY=m +# CONFIG_MDIO_HISI_FEMAC is not set +# CONFIG_MDIO_XGENE is not set CONFIG_LSI_ET1011C_PHY=m CONFIG_LXT_PHY=m CONFIG_MARVELL_PHY=m @@ -2017,6 +2024,7 @@ CONFIG_MPLS_ROUTING=m CONFIG_MPLS_IPTUNNEL=m CONFIG_NET_SWITCHDEV=y +CONFIG_NET_NCSI=y CONFIG_6LOWPAN=m CONFIG_6LOWPAN_NHC=m @@ -2389,6 +2397,7 @@ CONFIG_TABLET_USB_AIPTEK=m CONFIG_TABLET_USB_GTCO=m CONFIG_TABLET_USB_HANWANG=m CONFIG_TABLET_USB_KBTAB=m +CONFIG_TABLET_USB_PEGASUS=m CONFIG_TABLET_SERIAL_WACOM4=m CONFIG_INPUT_POWERMATE=m @@ -2397,6 +2406,7 @@ CONFIG_INPUT_CM109=m CONFIG_INPUT_POLLDEV=m CONFIG_INPUT_SPARSEKMAP=m # CONFIG_INPUT_ADXL34X is not set +# CONFIG_INPUT_ATMEL_CAPTOUCH is not set # CONFIG_INPUT_BMA150 is not set # CONFIG_INPUT_IMS_PCU is not set CONFIG_INPUT_CMA3000=m @@ -2546,7 +2556,9 @@ CONFIG_TOUCHSCREEN_USB_COMPOSITE=m # CONFIG_TOUCHSCREEN_WM97XX is not set CONFIG_TOUCHSCREEN_W90X900=m # CONFIG_TOUCHSCREEN_BU21013 is not set +CONFIG_TOUCHSCREEN_RM_TS=m CONFIG_TOUCHSCREEN_ST1232=m +CONFIG_TOUCHSCREEN_SURFACE3_SPI=m CONFIG_TOUCHSCREEN_ATMEL_MXT=m # CONFIG_TOUCHSCREEN_MAX11801 is not set CONFIG_TOUCHSCREEN_AUO_PIXCIR=m @@ -5434,9 +5446,11 @@ CONFIG_LEDS_LM3530=m # CONFIG_LEDS_IS31FL32XX is not set CONFIG_LEDS_BLINKM=m CONFIG_LEDS_LP3944=m +CONFIG_LEDS_LP3952=m CONFIG_LEDS_LT3593=m CONFIG_LEDS_REGULATOR=m CONFIG_LEDS_TRIGGER_GPIO=m +CONFIG_LEDS_TRIGGER_DISK=y CONFIG_LEDS_WM8350=m CONFIG_LEDS_WM831X_STATUS=m # CONFIG_LEDS_DAC124S085 is not set @@ -5643,6 +5657,12 @@ CONFIG_NET_DSA_MV88E6060=m CONFIG_NET_DSA_MV88E6XXX=m CONFIG_NET_DSA_BCM_SF2=m +CONFIG_B53=m +CONFIG_B53_SPI_DRIVER=m +CONFIG_B53_MDIO_DRIVER=m +CONFIG_B53_MMAP_DRIVER=m +CONFIG_B53_SRAB_DRIVER=m + # Used by Maemo, we don't care. # CONFIG_PHONET is not set diff --git a/config-powerpc64-generic b/config-powerpc64-generic index 5e86436cc..6d0b57d44 100644 --- a/config-powerpc64-generic +++ b/config-powerpc64-generic @@ -208,6 +208,7 @@ CONFIG_LEDS_TRIGGER_TIMER=m CONFIG_LEDS_TRIGGER_HEARTBEAT=m CONFIG_LEDS_TRIGGER_GPIO=m CONFIG_LEDS_POWERNV=m +CONFIG_ADB_PMU_LED_DISK=y CONFIG_USB_EHCI_HCD_PPC_OF=y CONFIG_USB_OHCI_HCD_PCI=y @@ -1 +1 @@ -0e06f5c0deeef0332a5da2ecb8f1fcf3e024d958 +194dc870a5890e855ecffb30f3b80ba7c88f96d6 diff --git a/kernel.spec b/kernel.spec index aa6821d17..169ff29d2 100644 --- a/kernel.spec +++ b/kernel.spec @@ -69,7 +69,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 1 +%define gitrev 2 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2172,6 +2172,9 @@ fi # # %changelog +* Thu Jul 28 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.8.0-0.rc0.git2.1 +- Linux v4.7-5906-g194dc87 + * Thu Jul 28 2016 Josh Boyer <jwboyer@fedoraproject.org> - CVE-2016-5412 powerpc: kvm: Infinite loop in HV mode (rhbz 1349916 1361040) @@ -1,3 +1,3 @@ 5276563eb1f39a048e4a8a887408c031 linux-4.7.tar.xz fe259c02c75eec61d1aa4b1211f3c853 perf-man-4.7.tar.gz -546515340e91cf723e79a735a53e3588 patch-4.7-git1.xz +891c3c1a3b649e9559bc67a50dcc75cd patch-4.7-git2.xz |