diff options
| -rw-r--r-- | config-arm-generic | 1 | ||||
| -rw-r--r-- | config-arm64 | 3 | ||||
| -rw-r--r-- | config-armv7 | 3 | ||||
| -rw-r--r-- | config-armv7-generic | 4 | ||||
| -rw-r--r-- | cpupower-Fix-build-error-in-cpufreq-info.patch | 40 | ||||
| -rw-r--r-- | gitrev | 2 | ||||
| -rw-r--r-- | kernel.spec | 8 | ||||
| -rw-r--r-- | sources | 2 |
8 files changed, 17 insertions, 46 deletions
diff --git a/config-arm-generic b/config-arm-generic index 12cb852cb..987695636 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -209,6 +209,7 @@ CONFIG_USB_CONFIGFS_ACM=y CONFIG_USB_CONFIGFS_ECM=y CONFIG_USB_CONFIGFS_ECM_SUBSET=y CONFIG_USB_CONFIGFS_EEM=y +CONFIG_USB_CONFIGFS_F_TCM=y CONFIG_USB_CONFIGFS_MASS_STORAGE=y CONFIG_USB_CONFIGFS_NCM=y CONFIG_USB_CONFIGFS_OBEX=y diff --git a/config-arm64 b/config-arm64 index c6bcff93a..b6698c506 100644 --- a/config-arm64 +++ b/config-arm64 @@ -17,11 +17,13 @@ CONFIG_ARCH_XGENE=y # CONFIG_ARCH_LAYERSCAPE is not set # CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_RENESAS is not set # CONFIG_ARCH_SPRD is not set # CONFIG_ARCH_STRATIX10 is not set # CONFIG_ARCH_TEGRA is not set # CONFIG_ARCH_THUNDER is not set # CONFIG_ARCH_ZYNQMP is not set +# CONFIG_ARCH_UNIPHIER is not set # Erratum CONFIG_ARM64_ERRATUM_826319=y @@ -151,6 +153,7 @@ CONFIG_POWER_RESET_HISI=y CONFIG_HISI_THERMAL=m CONFIG_STUB_CLK_HI6220=y CONFIG_PHY_HI6220_USB=m +CONFIG_COMMON_RESET_HI6220=m # ThunderX # CONFIG_MDIO_OCTEON is not set diff --git a/config-armv7 b/config-armv7 index 0cc0fa55a..271751071 100644 --- a/config-armv7 +++ b/config-armv7 @@ -348,6 +348,9 @@ CONFIG_QCOM_SMEM=m CONFIG_REGULATOR_QCOM_SMD_RPM=m CONFIG_QCOM_SMEM=m CONFIG_QCOM_QFPROM=m +CONFIG_QCOM_WCNSS_CTRL=m +CONFIG_QCOM_SMSM=y +CONFIG_QCOM_SMP2P=m # i.MX # CONFIG_MXC_DEBUG_BOARD is not set diff --git a/config-armv7-generic b/config-armv7-generic index 4ea4da8dd..48941c0f6 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -61,13 +61,17 @@ CONFIG_ARCH_VIRT=y # CONFIG_ARCH_HISI is not set # CONFIG_ARCH_MEDIATEK is not set # CONFIG_ARCH_MESON is not set +# CONFIG_ARCH_MMP is not set # CONFIG_ARCH_QCOM is not set +# CONFIG_ARCH_REALVIEW is not set +# CONFIG_ARCH_RENESAS is not set # CONFIG_ARCH_S5PV210 is not set # CONFIG_ARCH_SHMOBILE_MULTI is not set # CONFIG_ARCH_SIRF is not set # CONFIG_ARCH_SOCFPGA is not set # CONFIG_PLAT_SPEAR is not set # CONFIG_ARCH_STI is not set +# CONFIG_ARCH_TANGO is not set # CONFIG_ARCH_U8500 is not set # CONFIG_ARCH_VEXPRESS_SPC is not set # CONFIG_ARCH_WM8850 is not set diff --git a/cpupower-Fix-build-error-in-cpufreq-info.patch b/cpupower-Fix-build-error-in-cpufreq-info.patch deleted file mode 100644 index 618e3edf2..000000000 --- a/cpupower-Fix-build-error-in-cpufreq-info.patch +++ /dev/null @@ -1,40 +0,0 @@ -From patchwork Mon Jan 18 15:14:43 2016 -Content-Type: text/plain; charset="utf-8" -MIME-Version: 1.0 -Content-Transfer-Encoding: 8bit -Subject: cpupower: Fix build error in cpufreq-info -From: "Shreyas B. Prabhu" <shreyas@linux.vnet.ibm.com> -X-Patchwork-Id: 8055301 -Message-Id: <1453130083-16055-1-git-send-email-shreyas@linux.vnet.ibm.com> -To: trenn@suse.com -Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, - rafael.j.wysocki@intel.com, jtanenba@redhat.com, - "Shreyas B. Prabhu" <shreyas@linux.vnet.ibm.com> -Date: Mon, 18 Jan 2016 20:44:43 +0530 - -Fix the following build error by including limits.h - - -utils/cpufreq-info.c: In function ‘get_latency’: -utils/cpufreq-info.c:437:29: error: ‘UINT_MAX’ undeclared (first use in -this function) - if (!latency || latency == UINT_MAX) { - ^ -Signed-off-by: Shreyas B. Prabhu <shreyas@linux.vnet.ibm.com> -Fixes: e98f033f94f3 (cpupower: fix how "cpupower frequency-info" interprets latency) - ---- -tools/power/cpupower/utils/cpufreq-info.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/tools/power/cpupower/utils/cpufreq-info.c b/tools/power/cpupower/utils/cpufreq-info.c -index 8f3f5bb9c74e..590d12a25f6e 100644 ---- a/tools/power/cpupower/utils/cpufreq-info.c -+++ b/tools/power/cpupower/utils/cpufreq-info.c -@@ -10,6 +10,7 @@ - #include <errno.h> - #include <stdlib.h> - #include <string.h> -+#include <limits.h> - - #include <getopt.h> - @@ -1 +1 @@ -2b4015e9fb335aa6982a68dbe6e4158d6c1b10ee +30f05309bde49295e02e45c7e615f73aa4e0ccc2 diff --git a/kernel.spec b/kernel.spec index 44f4d28f5..90ac28b95 100644 --- a/kernel.spec +++ b/kernel.spec @@ -67,7 +67,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 7 +%define gitrev 8 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -596,9 +596,6 @@ Patch621: drm-udl-Use-unlocked-gem-unreferencing.patch #CVE-2015-7566 rhbz 1296466 1297517 Patch623: usb-serial-visor-fix-crash-on-detecting-device-witho.patch -# https://patchwork.kernel.org/patch/8055301/ -Patch625: cpupower-Fix-build-error-in-cpufreq-info.patch - #CVE-2016-0723 rhbz 1296253 1300224 Patch637: tty-Fix-unsafe-ldisc-reference-via-ioctl-TIOCGETD.patch @@ -2050,6 +2047,9 @@ fi # # %changelog +* Thu Jan 21 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc0.git8.1 +- Linux v4.4-10062-g30f0530 + * Thu Jan 21 2016 Josh Boyer <jwboyer@fedoraproject.org> - Fix incorrect country code issue on RTL8812AE devices (rhbz 1279653) @@ -1,3 +1,3 @@ 9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz dcbc8fe378a676d5d0dd208cf524e144 perf-man-4.4.tar.gz -4a6920139ec6f59ebb913cf13aad26af patch-4.4-git7.xz +07568b33575bf864c7a4bb94eb0d29bb patch-4.4-git8.xz |