Can you use the new copyright header I posted? Also it's good to hold off on Makefile/Kconfig changes for now, since that will simplify generating patches for upstream merging. If it gets too difficult to hold back on the CM, I would suggest developing the CM on a branch. - R.