Hi all,
Today's linux-next merge of the arm-soc tree got a conflict in
drivers/crypto/omap-sham.c between commit dfd061d5a8f5 ("crypto:
omap-sham - Add code to use dmaengine API") from the crypto tree and
commit a62a6e98c370 ("ARM: OMAP2+: Disable code that currently does not
work with multiplaform") from the arm-soc tree.
I fixed it up (the former removed the include that the latter protected)
and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpknUTpUGqdU.pgp
Description: PGP signature
