summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2016-01-29 12:44:06 -0600
committerJustin M. Forbes <jforbes@redhat.com>2016-01-29 12:44:06 -0600
commit5804d1e506746192ac9cc3a791b82b5ecd03938c (patch)
tree3259a9743cef01c01366e85dc09f274ce5e8df69
parent5f5d60cddb2c963392d241b552744f7085e035ec (diff)
downloadkernel-5804d1e506746192ac9cc3a791b82b5ecd03938c.tar.gz
kernel-5804d1e506746192ac9cc3a791b82b5ecd03938c.tar.xz
kernel-5804d1e506746192ac9cc3a791b82b5ecd03938c.zip
Linux v4.5-rc1-32-g26cd836
-rw-r--r--config-generic6
-rw-r--r--gitrev2
-rw-r--r--kernel.spec5
-rw-r--r--sources2
4 files changed, 11 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index e4f0a11bd..2830de78c 100644
--- a/config-generic
+++ b/config-generic
@@ -1706,7 +1706,11 @@ CONFIG_MLX4_INFINIBAND=m
CONFIG_MLX5_CORE=m
CONFIG_MLX5_CORE_EN=y
CONFIG_MLX5_INFINIBAND=m
-# CONFIG_MLXSW_CORE is not set
+CONFIG_MLXSW_CORE=m
+CONFIG_MLXSW_CORE_HWMON=y
+CONFIG_MLXSW_PCI=m
+CONFIG_MLXSW_SWITCHX2=m
+CONFIG_MLXSW_SPECTRUM=m
# CONFIG_MLX4_DEBUG is not set
# CONFIG_SFC is not set
diff --git a/gitrev b/gitrev
index ab74ccb0b..2b44e2e08 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-03c21cb775a313f1ff19be59c5d02df3e3526471
+26cd83670f2f5a3d5b5514a1f7d96567cdb9558b
diff --git a/kernel.spec b/kernel.spec
index 23fd2bb05..7232b3a92 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -67,7 +67,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 1
# The git snapshot level
-%define gitrev 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 4.%{upstream_sublevel}.0
%endif
@@ -2057,6 +2057,9 @@ fi
#
#
%changelog
+* Fri Jan 29 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.5.0-0.rc1.git2.1
+- Linux v4.5-rc1-32-g26cd836
+
* Thu Jan 28 2016 Josh Boyer <jwboyer@fedoraproject.org>
- Add patches to fix suprious NEWLINK netlink messages (rhbz 1302037)
diff --git a/sources b/sources
index 4d31040ef..9b22193ff 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
9a78fa2eb6c68ca5a40ed5af08142599 linux-4.4.tar.xz
dcbc8fe378a676d5d0dd208cf524e144 perf-man-4.4.tar.gz
be93ac61332d8fc365c5fd4e41797f5c patch-4.5-rc1.xz
-ad897ddf281e291559487031b2a0da74 patch-4.5-rc1-git1.xz
+436a38fbe087d4fc73ebe7bab6275040 patch-4.5-rc1-git2.xz