Messages in this thread | | | Date | Thu, 22 Oct 2015 13:26:52 +1100 | From | Stephen Rothwell <> | Subject | linux-next: manual merge of the tip tree with the arm64 tree |
| |
Hi all,
Today's linux-next merge of the tip tree got a conflict in:
arch/arm64/kernel/cpufeature.c
between commit:
da8d02d19ffd ("arm64/capabilities: Make use of system wide safe value")
from the arm64 tree and commit:
963fcd409587 ("arm64: cpufeatures: Check ICC_EL1_SRE.SRE before enabling ARM64_HAS_SYSREG_GIC_CPUIF")
from the tip tree.
I fixed it up (I have no idea here, so I just used the arm64 tree version) and can carry the fix as necessary (no action is required).
-- Cheers, Stephen Rothwell sfr@canb.auug.org.au
| |