From: David S. Miller Date: Thu, 12 Feb 2015 03:48:14 +0000 (-0800) Subject: Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux X-Git-Tag: v4.1-rc1~128^2~428 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=855e7e7174bade3f2b63077a81eea5aab525dbf6;p=thirdparty%2Fkernel%2Fstable.git Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux I pushed a version of the crypto iov_iter bug fix that Al Viro wrote, but Linus put in a different copy of the same fix into his tree. I then reverted my commit in net-next, and that's why we have a merge when pulling in Linus's tree. Signed-off-by: David S. Miller --- 855e7e7174bade3f2b63077a81eea5aab525dbf6