linux-next: manual merge of the trivial tree with the crypto tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in
drivers/crypto/ux500/hash/hash_core.c between commit 69d2884debaa
("crypto: ux500 - Fix logging, make arrays const, neatening") from the
crypto tree and commit 0b1587b18bfe ("treewide: Fix typo in printk") from
the trivial tree.

I fixed it up (the former is a superset of the latter, so I used that)
and can carry the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

Attachment: pgpxKFYf7QuXU.pgp
Description: PGP signature


[Index of Archives]     [Linux Kernel]     [Linux USB Development]     [Yosemite News]     [Linux SCSI]

  Powered by Linux