Merge "drivers/misc: add protection for probe order changes"