rpc parts should now build, so remove from patch
Merge branch 'kernel-src' into all-src