forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions
linux-uconsole/fs/f2fs
History
Tao Huang 3430c68a33 Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git 
* linux-linaro-lsk-v4.4-android: (660 commits)
  ANDROID: keychord: Check for write data size
  ANDROID: sdcardfs: Set num in extension_details during make_item
  ANDROID: sdcardfs: Hold i_mutex for i_size_write
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck64-XTS
  BACKPORT, FROMGIT: crypto: speck - add test vectors for Speck128-XTS
  BACKPORT, FROMGIT: crypto: arm/speck - add NEON-accelerated implementation of Speck-XTS
  FROMGIT: crypto: speck - export common helpers
  BACKPORT, FROMGIT: crypto: speck - add support for the Speck block cipher
  UPSTREAM: ANDROID: binder: synchronize_rcu() when using POLLFREE.
  f2fs: updates on v4.16-rc1
  BACKPORT: tee: shm: Potential NULL dereference calling tee_shm_register()
  BACKPORT: tee: shm: don't put_page on null shm->pages
  BACKPORT: tee: shm: make function __tee_shm_alloc static
  BACKPORT: tee: optee: check type of registered shared memory
  BACKPORT: tee: add start argument to shm_register callback
  BACKPORT: tee: optee: fix header dependencies
  BACKPORT: tee: shm: inline tee_shm_get_id()
  BACKPORT: tee: use reference counting for tee_context
  BACKPORT: tee: optee: enable dynamic SHM support
  BACKPORT: tee: optee: add optee-specific shared pool implementation
  ...

Conflicts:
	drivers/irqchip/Kconfig
	drivers/media/i2c/tc35874x.c
	drivers/media/v4l2-core/v4l2-compat-ioctl32.c
	drivers/usb/gadget/function/f_fs.c
	fs/f2fs/node.c

Change-Id: Icecd73a515821b536fa3d81ea91b63d9b3699916
2018-03-09 19:10:14 +08:00
..
acl.c f2fs: updates on 4.15-rc1 2018-01-22 13:15:43 +05:30
acl.h f2fs: backport from (4c1fad64 - Merge tag 'for-f2fs-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) 2017-10-15 23:28:17 +05:30
checkpoint.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
data.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
debug.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
dir.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
extent_cache.c f2fs: catch up to v4.14-rc1 2017-10-15 23:28:32 +05:30
f2fs.h f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
file.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
gc.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
gc.h f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
hash.c f2fs: catch up to v4.14-rc1 2017-10-15 23:28:32 +05:30
inline.c f2fs: updates on 4.15-rc1 2018-01-22 13:15:43 +05:30
inode.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
Kconfig f2fs: remove wrong backported codes 2017-10-15 23:28:32 +05:30
Makefile f2fs: catch up to v4.14-rc1 2017-10-15 23:28:32 +05:30
namei.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
node.c Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git 2018-03-09 19:10:14 +08:00
node.h f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
recovery.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
segment.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
segment.h f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
shrinker.c f2fs: updates on 4.15-rc1 2018-01-22 13:15:43 +05:30
super.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
sysfs.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
trace.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
trace.h f2fs: add sbi and page pointer in f2fs_io_info 2015-05-28 15:41:32 -07:00
xattr.c f2fs: updates on v4.16-rc1 2018-03-05 21:59:41 +05:30
xattr.h f2fs: catch up to v4.14-rc1 2017-10-15 23:28:32 +05:30