ipq806x: rework rootfs conflicts patch for smem