Kernel modules for buttons handling shouldn't be included in trunk also?

Hi all
I have a doubt regarding the modules that handle the buttons event, such kmod-gpio-button-hotplug and kmod-button-hotplug.
I have noticed that these modules normally are not included in trunk image.
Since the failsafe mode, which is triggered via buttons, has saved me several time from having to deal with uboot recovery, I am wondering what would happens if, upgrading to some trunk build, the results in the device not being able to boot due to configuration issue. I am afraid that without those modules, it is not possible to trigger failsafe, right?