Merge "defconfig: sa415m: Disable CONFIG_CNSS_GENL"