$ 0 0 Hi Greg, Today's linux-next merge of the staging tree got a conflict in: drivers/staging/lustre/lustre/libcfs/linux/linux-crypto.c between commit