summaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/string.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-05-19 15:22:03 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2019-05-19 15:22:03 -0700
commit2e2c12200153e63749f836109cef8150f9c61ed8 (patch)
tree0648d6b6a06449c1e6f793a0001cd4908ad8a603 /arch/arm/include/asm/string.h
parentcb6f8739fbf98203d0fb0bc2c2dbbec0ddfe978a (diff)
parent4dd0481584d09221849ac8a3af4cd3cefd58c11e (diff)
Merge tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs
Pull UBIFS fixes from Richard Weinberger: - build errors wrt xattrs - mismerge which lead to a wrong Kconfig ifdef - missing endianness conversion * tag 'upstream-5.2-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs: ubifs: Convert xattr inum to host order ubifs: Use correct config name for encryption ubifs: Fix build error without CONFIG_UBIFS_FS_XATTR
Diffstat (limited to 'arch/arm/include/asm/string.h')
0 files changed, 0 insertions, 0 deletions