From ea07b7aad97f41bb4b451fc80bd3f102f0440053 Mon Sep 17 00:00:00 2001
From: "Justin M. Forbes" <jforbes@fedoraproject.org>
Date: Tue, 22 Mar 2022 15:08:19 -0500
Subject: kernel-5.17-300

* Tue Mar 22 2022 Justin M. Forbes <jforbes@fedoraproject.org> [5.17-300]
- Revert "PCI/MSI: Mask MSI-X vectors only on success" (Justin M. Forbes)
- Define SNAPSHOT correctly for VERSION_ON_UPSTREAM=0 (Justin M. Forbes)
- Config fixups after some RHEL specific patches were reverted (Justin M. Forbes)
- Basic Fedora Branch setup (Justin M. Forbes)
- Reset Makefile.rhelver for the 5.18 cycle (Justin M. Forbes)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
---
 kernel-s390x-debug-rhel.config | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'kernel-s390x-debug-rhel.config')

diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config
index 2be014f2f..1c3f90a3a 100644
--- a/kernel-s390x-debug-rhel.config
+++ b/kernel-s390x-debug-rhel.config
@@ -2174,6 +2174,7 @@ CONFIG_INTEL_IDXD=m
 # CONFIG_INTEL_MEI_HDCP is not set
 # CONFIG_INTEL_MEI_PXP is not set
 # CONFIG_INTEL_MEI_TXE is not set
+# CONFIG_INTEL_MIC_BUS is not set
 # CONFIG_INTEL_PMC_CORE is not set
 # CONFIG_INTEL_PMT_CLASS is not set
 # CONFIG_INTEL_PMT_CRASHLOG is not set
@@ -3234,7 +3235,7 @@ CONFIG_NET_CORE=y
 CONFIG_NETDEV_ADDR_LIST_TEST=m
 CONFIG_NETDEVICES=y
 CONFIG_NET_DEVLINK=y
-# CONFIG_NET_DEV_REFCNT_TRACKER is not set
+CONFIG_NET_DEV_REFCNT_TRACKER=y
 CONFIG_NETDEVSIM=m
 CONFIG_NET_DROP_MONITOR=y
 # CONFIG_NET_DSA is not set
@@ -3352,7 +3353,7 @@ CONFIG_NETLINK_DIAG=y
 CONFIG_NET_MPLS_GSO=y
 # CONFIG_NET_NCSI is not set
 CONFIG_NET_NSH=y
-# CONFIG_NET_NS_REFCNT_TRACKER is not set
+CONFIG_NET_NS_REFCNT_TRACKER=y
 CONFIG_NET_NS=y
 CONFIG_NET_PKTGEN=m
 CONFIG_NET_POLL_CONTROLLER=y
@@ -4211,6 +4212,7 @@ CONFIG_RETPOLINE=y
 # CONFIG_RFKILL_GPIO is not set
 CONFIG_RFKILL_INPUT=y
 CONFIG_RFKILL=m
+CONFIG_RH_DISABLE_DEPRECATED=y
 CONFIG_RHEL_DIFFERENCES=y
 CONFIG_RING_BUFFER_BENCHMARK=m
 # CONFIG_RING_BUFFER_STARTUP_TEST is not set
@@ -4438,6 +4440,7 @@ CONFIG_SCHED_STACK_END_CHECK=y
 CONFIG_SCHEDSTATS=y
 CONFIG_SCHED_TOPOLOGY=y
 CONFIG_SCHED_TRACER=y
+# CONFIG_SCIF_BUS is not set
 CONFIG_SCLP_CONSOLE=y
 # CONFIG_SCLP_OFB is not set
 CONFIG_SCLP_TTY=y
@@ -6429,6 +6432,7 @@ CONFIG_VMCP=y
 # CONFIG_VME_BUS is not set
 CONFIG_VMLOGRDR=m
 # CONFIG_VMXNET3 is not set
+# CONFIG_VOP_BUS is not set
 CONFIG_VP_VDPA=m
 CONFIG_VSOCKETS_DIAG=m
 CONFIG_VSOCKETS_LOOPBACK=m
-- 
cgit