Linus Torvalds 677375cef8 Only bug fixes and cleanups for this merge window. ...

-----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEK2m5VNv+CHkogTfJ8vlZVpUNgaMFAlkPYHkACgkQ8vlZVpUN
 gaM97ggAlOm8n/tlbcdonX/+HHjlnqcy5uYD7A9AH/JordpRzy4eqcMbxMG39p1R
 DBtjo9Y0i3iFEGajRc0h7KXDLeTBUQ/JZpR8H60MFfAQHnTowuI91eb3/6QeZiHh
 CN/2KKzpYitPIEUfEHnVeYKOfvrzR7je5hrEiAwEkPeKv7XyrNVM0LHQ/jKpbQwg
 ntIzHvxjQyo8plx/m5S4Yew7tqjYpNiq4plmyk/Vxtw2FmB/FC76UxYeadoB3EI5
 etw+bCORB0tFZO27o56kXywg+mDcp7HEtVvq9LG28oEuBDAVKNoeKEvV7SiOBlZp
 +HnqIz5Hx1UTxOlTAc10IjvEhriEuw==
 =qCDl
 -----END PGP SIGNATURE-----

Merge tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt

Pull fscrypt updates from Ted Ts'o:
 "Only bug fixes and cleanups for this merge window"

* tag 'fscrypt_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/fscrypt:
  fscrypt: correct collision claim for digested names
  MAINTAINERS: fscrypt: update mailing list, patchwork, and git
  ext4: clean up ext4_match() and callers
  f2fs: switch to using fscrypt_match_name()
  ext4: switch to using fscrypt_match_name()
  fscrypt: introduce helper function for filename matching
  fscrypt: avoid collisions when presenting long encrypted filenames
  f2fs: check entire encrypted bigname when finding a dentry
  ubifs: check for consistent encryption contexts in ubifs_lookup()
  f2fs: sync f2fs_lookup() with ext4_lookup()
  ext4: remove "nokey" check from ext4_lookup()
  fscrypt: fix context consistency check when key(s) unavailable
  fscrypt: Remove __packed from fscrypt_policy
  fscrypt: Move key structure and constants to uapi
  fscrypt: remove fscrypt_symlink_data_len()
  fscrypt: remove unnecessary checks for NULL operations

2017-05-08 11:40:34 -07:00

..

acl.c

ext4: use current_time() for inode timestamps

2016-11-14 21:40:10 -05:00

acl.h

ext2/3/4: use generic posix ACL infrastructure

2014-01-25 23:58:19 -05:00

balloc.c

The major change this cycle is deleting ext4's copy of the file system

2016-07-26 18:35:55 -07:00

bitmap.c

ext4: remove unused header files

2015-04-02 23:47:42 -04:00

block_validity.c

ext4: add missing KERN_CONT to a few more debugging uses

2016-10-15 09:57:31 -04:00

dir.c

ext4: remove unused variable

2016-09-30 02:14:56 -04:00

ext4_extents.h

ext4: fix misspellings in comments.

2016-03-09 23:49:05 -05:00

ext4_jbd2.c

ext4: add shutdown bit and check for it

2017-02-05 01:28:48 -05:00

ext4_jbd2.h

ext4: do not perform data journaling when data is encrypted

2016-12-10 17:54:58 -05:00

ext4.h

Add GETFSMAP support; some performance improvements for very large

2017-05-08 11:30:05 -07:00

extents_status.c

scripts/spelling.txt: add "comsume(r)" pattern and fix typo instances

2017-02-27 18:43:47 -08:00

extents_status.h

ext4: move procfs registration code to fs/ext4/sysfs.c

2015-09-23 12:46:17 -04:00

extents.c

ext4: do not polute the extents cache while shifting extents

2017-01-08 21:00:35 -05:00

file.c

ext4: Add statx support

2017-04-03 01:05:58 -04:00

fsmap.c

ext4: support GETFSMAP ioctls

2017-04-30 00:36:53 -04:00

fsmap.h

ext4: support GETFSMAP ioctls

2017-04-30 00:36:53 -04:00

fsync.c

ext4: add shutdown bit and check for it

2017-02-05 01:28:48 -05:00

hash.c

ext4: move halfmd4 into hash.c directly

2017-02-02 11:52:14 -05:00

ialloc.c

ext4: inherit encryption xattr before other xattrs

2017-05-02 00:49:54 -04:00

indirect.c

ext4: refactor direct IO code

2016-05-13 00:44:16 -04:00

inline.c

ext4: trim return value and 'dir' argument from ext4_insert_dentry()

2017-04-29 23:27:26 -04:00

inode.c

Add GETFSMAP support; some performance improvements for very large

2017-05-08 11:30:05 -07:00

ioctl.c

Add GETFSMAP support; some performance improvements for very large

2017-05-08 11:30:05 -07:00

Kconfig

dax: fix build warnings with FS_DAX and !FS_IOMAP

2017-01-24 16:26:14 -08:00

Makefile

ext4: support GETFSMAP ioctls

2017-04-30 00:36:53 -04:00

mballoc.c

ext4: support GETFSMAP ioctls

2017-04-30 00:36:53 -04:00

mballoc.h

ext4: support GETFSMAP ioctls

2017-04-30 00:36:53 -04:00

migrate.c

ext4: fix misspellings in comments.

2016-03-09 23:49:05 -05:00

mmp.c

block,fs: use REQ_* flags directly

2016-11-01 09:43:26 -06:00

move_extent.c

Fix a memory leak on an error path, and two races when modifying

2017-03-26 10:29:21 -07:00

namei.c

Only bug fixes and cleanups for this merge window.

2017-05-08 11:40:34 -07:00

page-io.c

ext4: replace BUG_ON with WARN_ONCE in ext4_end_bio()

2017-04-30 20:08:05 -04:00

readpage.c

Merge branch 'akpm' (patches from Andrew)

2016-07-26 19:55:54 -07:00

resize.c

ext4: rename s_resize_flags to s_ext4_flags

2017-02-05 01:27:48 -05:00

super.c

Add GETFSMAP support; some performance improvements for very large

2017-05-08 11:30:05 -07:00

symlink.c

ext4: Add statx support

2017-04-03 01:05:58 -04:00

sysfs.c

ext4: constify static data that is never modified

2017-04-29 23:47:50 -04:00

truncate.h

ext4: fix races between page faults and hole punching

2015-12-07 14:28:03 -05:00

xattr_security.c

switch xattr_handler->set() to passing dentry and inode separately

2016-05-27 15:39:43 -04:00

xattr_trusted.c

switch xattr_handler->set() to passing dentry and inode separately

2016-05-27 15:39:43 -04:00

xattr_user.c

switch xattr_handler->set() to passing dentry and inode separately

2016-05-27 15:39:43 -04:00

xattr.c

ext4: remove ext4_xattr_check_entry()

2017-04-30 00:01:02 -04:00

xattr.h

ext4: fix deadlock between inline_data and ext4_expand_extra_isize_ea()

2017-01-11 21:50:46 -05:00