linux-next: manual merge of the tip tree with the arm64 tree

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the tip tree with the arm64 tree
Date	2015-10-22 04:30 +0200
Message-ID	<qmdND-5kE-5@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the tip tree with the arm64 tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-10-22 04:30 +0200
  Re: linux-next: manual merge of the tip tree with the arm64 tree "Suzuki K. Poulose" <Suzuki.Poulose@arm.com> - 2015-10-22 14:10 +0200
    Re: linux-next: manual merge of the tip tree with the arm64 tree Catalin Marinas <catalin.marinas@arm.com> - 2015-10-22 17:40 +0200

csiph-web