[GIT PULL v2] arm64: hisilicon: config changes for 4.7

[Arnd Bergmann]

On Monday 18 April 2016 16:08:26 Wei Xu wrote:
> Please help to pull the following changes.
> 
> I based this pull request on v4.6-rc4 instead of rc1 to avoid the
> duplication that some configurations have been enabled.
> 
> 

Hi Wei,

Unfortunately basing it on top of -rc4 causes us more problems than
it solves. If at all possible, can you rebase on top of -rc3 or earlier?

The problem is backmerging code from mainline into arm-soc, as that
makes it ambiguous later when we send the pull request to Linus regarding
which changes are coming from us or not.

	Arnd