Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs

Browse source

Pull UDF fix from Jan Kara:
 "A fix of a regression in UDF that got introduced in 4.6-rc1 by one of
  the charset encoding fixes"

* 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
  udf: Fix conversion of 'dstring' fields to UTF8

...

This commit is contained in:

Linus Torvalds 2016-05-02 09:59:57 -07:00

parent 5f40adbc3e c26f6c6157

commit 33656a1f2e

3 changed files with 17 additions and 5 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

fs/udf/super.c

View file

2

fs/udf/udfdecl.h

View file

16

fs/udf/unicode.c

View file