Merge 0011-XX.patch into 0008-XX.patch