summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-06-19 07:05:14 -1000
committerLinus Torvalds <torvalds@linux-foundation.org>2016-06-19 07:05:14 -1000
commitc3695331f3a326a468bd6a5b6f05b481b399726b (patch)
tree7ba112e687646068c0081015a1abf843122c4572 /Makefile
parent9af1f5d8f20f97884da55817ab80a6fcd170f296 (diff)
parentb9d8905e4a751e2cdc0fb474856b7183c594dcc6 (diff)
downloadop-kernel-dev-c3695331f3a326a468bd6a5b6f05b481b399726b.zip
op-kernel-dev-c3695331f3a326a468bd6a5b6f05b481b399726b.tar.gz
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
Pull UDF fixes and a reiserfs fix from Jan Kara: "A couple of udf fixes (most notably a bug in parsing UDF partitions which led to inability to mount recent Windows installation media) and a reiserfs fix for handling kstrdup failure" * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs: reiserfs: check kstrdup failure udf: Use correct partition reference number for metadata udf: Use IS_ERR when loading metadata mirror file entry udf: Don't BUG on missing metadata partition descriptor
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud