linux-next: manual merge of the spi-fixes tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the spi-fixes tree got a conflict in:

  drivers/spi/spi-tegra20-slink.c

between commit:

  ac8a6eba2a11 ("spi: Fix tegra20 build with CONFIG_PM=n once again")

from Linus' tree and commit:

  6b6c496a88e7 ("spi: tegra20: fix build with CONFIG_PM_SLEEP=n")

from the spi-fixes tree.

I fixed it up (I just used the former) and can carry the fix as
necessary. This is now fixed as far as linux-next is concerned, but any
non trivial conflicts should be mentioned to your upstream maintainer
when your tree is submitted for merging.  You may also want to consider
cooperating with the maintainer of the conflicting tree to minimise any
particularly complex conflicts.

-- 
Cheers,
Stephen Rothwell

Attachment: pgpPEaH1sfGIo.pgp
Description: OpenPGP digital signature