mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
* linux-next: manual merge of the crypto tree with the imx-mxs tree
@ 2015-08-12  3:22 Stephen Rothwell
  2015-08-12  5:18 ` Herbert Xu
  0 siblings, 1 reply; 3+ messages in thread
From: Stephen Rothwell @ 2015-08-12  3:22 UTC (permalink / raw)
  To: Herbert Xu, Shawn Guo
  Cc: linux-next, linux-kernel, Victoria Milhoan, Shengjiu Wang

Hi Herbert,

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

  arch/arm/configs/imx_v6_v7_defconfig

between commit:

  351265f46291 ("ARM: imx_v6_v7_defconfig: build in audio driver")

from the imx-mxs tree and commit:

  ab86ca0755ec ("ARM: imx_v6_v7_defconfig: Select CAAM")

from the crypto tree.

I fixed it up (they both removed the same line) and can carry the fix
as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2015-08-12  5:40 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-12  3:22 linux-next: manual merge of the crypto tree with the imx-mxs tree Stephen Rothwell
2015-08-12  5:18 ` Herbert Xu
2015-08-12  5:40   ` Shawn Guo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®