DLPX-84608 Remove merge commit from linux-kernel-generic

jwk404 · Delphix Engineering · commit a42400b205e9 · 2023-06-04T04:11:38.000Z
PR URL: https://www.github.com/delphix/linux-kernel-generic/pull/20
diff --git a/debian.master/config/OVERRIDES b/debian.master/config/OVERRIDES
@@ -144,7 +144,6 @@ CONFIG_BROADCOM_PHY=n
 CONFIG_CASSINI=n
 CONFIG_CDROM=n
 CONFIG_CEPH_LIB=n
-CONFIG_CIFS=n
 CONFIG_CRAMFS=n
 CONFIG_CYCLADES=n
 CONFIG_DRM=n
