From a2e69cf2ffb177432d580294e2de97520c981442 Mon Sep 17 00:00:00 2001 From: Josh Boyer Date: Wed, 9 Sep 2015 13:22:00 -0400 Subject: [PATCH] Linux v4.2-10774-g26d2177e977c --- config-generic | 7 +++++-- kernel.spec | 5 ++++- sources | 3 +-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config-generic b/config-generic index 0eb1eca9a..0e80d631a 100644 --- a/config-generic +++ b/config-generic @@ -177,10 +177,12 @@ CONFIG_INFINIBAND_SRPT=m CONFIG_INFINIBAND_USER_MAD=m CONFIG_INFINIBAND_USER_ACCESS=m CONFIG_INFINIBAND_ON_DEMAND_PAGING=y -CONFIG_INFINIBAND_IPATH=m +# Deprecated and moved to staging +# CONFIG_INFINIBAND_IPATH is not set CONFIG_INFINIBAND_ISER=m CONFIG_INFINIBAND_ISERT=m -CONFIG_INFINIBAND_AMSO1100=m +# Deprecated and moved to staging +# CONFIG_INFINIBAND_AMSO1100 is not set # CONFIG_INFINIBAND_AMSO1100_DEBUG is not set CONFIG_INFINIBAND_CXGB3=m CONFIG_INFINIBAND_CXGB4=m @@ -5462,6 +5464,7 @@ CONFIG_USBIP_HOST=m # CONFIG_FB_SM7XX is not set # CONFIG_FB_TFT is not set # CONFIG_FB_SM750 is not set +# CONFIG_STAGING_RDMA is not set # END OF STAGING # diff --git a/kernel.spec b/kernel.spec index 0192011cc..7427048bc 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 10 +%define gitrev 11 # Set rpm version accordingly %define rpmversion 4.%{upstream_sublevel}.0 %endif @@ -2044,6 +2044,9 @@ fi # # %changelog +* Wed Sep 09 2015 Josh Boyer - 4.3.0-0.rc0.git11.1 +- Linux v4.2-10774-g26d2177e977c + * Wed Sep 09 2015 Josh Boyer - 4.3.0-0.rc0.git10.1 - Linux v4.2-10637-ga794b4f32921 - Rework secure boot patchset diff --git a/sources b/sources index d6c489e13..a597c6cf5 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ 3d5ea06d767e2f35c999eeadafc76523 linux-4.2.tar.xz 4c964bfba54d65b5b54cc898baddecad perf-man-4.2.tar.gz -6a9a3a0d7627f69cff33dcbb902fb967 patch-4.2-git9.xz -03499f6f8de1a578e3f9884a3a6cbd18 patch-4.2-git10.xz +0bb12d51b1cff86a5b5d2ad2cb3b588d patch-4.2-git11.xz