-From 4f70194021c2576fcfc3a506ee74815b44f90888 Mon Sep 17 00:00:00 2001
+From 4e5178b323d2710d9cf8b0fcabfabc48400a3797 Mon Sep 17 00:00:00 2001
From: Phil Elwell <phil@raspberrypi.org>
Date: Mon, 12 Nov 2018 21:42:00 +0000
-Subject: [PATCH 150/782] configs: Rebuild bcmrpi3_defconfig to fix warnings
+Subject: [PATCH 150/806] configs: Rebuild bcmrpi3_defconfig to fix warnings
Also disable CONFIG_MMC_BCM2835 to avoid a runtime conflict.