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

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 760 bytes --]

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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

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

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 905 bytes --]

Hi all,

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

  drivers/spi/spi-tegra20-slink.c

between commit:

  efafec27c565 ("spi: Fix tegra20 build with CONFIG_PM=n")

from the origin tree and commit:

  2bab94090b01 ("spi: tegra20-slink: Declare runtime suspend and resume functions conditionally")

from the spi-fixes tree.

I fixed it up (I just used the letter version as that has been in
linux-next for 10 days already) 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.

Mark, maybe fixes need to move on to Linus a bit faster?

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]