Replace x86-allow-1024-cpus.patch with the patch that contains the one hunk
not already applied upstream.
Don't install the 'trace' alias symlink for 'perf trace'. Seems much too
generic to just throw that into /usr/bin
Merge config changes from the various arch configs into generic-config where there's overlapping identical configs across all architectures. If there's a single arch that is difference to the rest of the architectures that option remains in the arch specific config as it takes precedence over the generic config.
