Update patch and split defconfig/module into two separate patches.