ext4: merge caf commit