-From 00fd230b49fe86d0458b3fbd92b9c556c1433fe4 Mon Sep 17 00:00:00 2001
+From 049db5dc012f133a8838503426a0cfa1cf9367a6 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/703] configs: Rebuild bcmrpi3_defconfig to fix warnings
+Subject: [PATCH 150/725] configs: Rebuild bcmrpi3_defconfig to fix warnings
Also disable CONFIG_MMC_BCM2835 to avoid a runtime conflict.