[opensuse-factory] kernel conflicts in last two TW updates