Petri Gynther
b5d151ed14
Merge android-4.9 (4.9.165+) into android-msm-bluecross-4.9-lts
commit 86a136d920 ("Revert "ANDROID: input: keychord: Add keychord driver"")
is the base for android-4.9-q branch.
* Revert "ANDROID: input: keychord: Add keychord driver"
drivers/input/misc/Kconfig
drivers/input/misc/Makefile
Revert "ANDROID: input: misc: keychord: move header to uapi"
Revert "ANDROID: input: misc: keychord: log when keychord triggered"
Revert "ANDROID: keychord: Fix a slab out-of-bounds read."
Revert "Use %zu to print resid (size_t)."
Revert "ANDROID: keychord: Fix races in keychord_write."
Revert "ANDROID: keychord: Fix for a memory leak in keychord."
Revert "ANDROID: keychord: Check for write data size"
ANDROID: drop CONFIG_INPUT_KEYCHORD from cuttlefish and ranchu
* BACKPORT: mm/debug.c: provide useful debugging information for VM_BUG
mm/debug.c
* UPSTREAM: bug: use %pB in BUG and stack protector failure
kernel/panic.c
lib/bug.c
UPSTREAM: x86/alternative: Print unadorned pointers
UPSTREAM: trace_uprobe: Display correct offset in uprobe_events
* UPSTREAM: usercopy: Remove pointer from overflow report
mm/usercopy.c
UPSTREAM: Do not hash userspace addresses in fault handlers
UPSTREAM: mm/slab.c: do not hash pointers when debugging slab
UPSTREAM: kasan: use %px to print addresses instead of %p
* BACKPORT: vsprintf: add printk specifier %px
lib/vsprintf.c
* BACKPORT: printk: hash addresses printed with %p
lib/vsprintf.c
* ANDROID: Fix race in crng_reseed()
drivers/char/random.c
* UPSTREAM: siphash: implement HalfSipHash1-3 for hash tables
include/linux/siphash.h
lib/siphash.c
* UPSTREAM: siphash: add cryptographically secure PRF
include/linux/siphash.h
lib/Kconfig.debug
lib/Makefile
lib/siphash.c
* BACKPORT: vsprintf: refactor %pK code out of pointer()
lib/vsprintf.c
BACKPORT: docs: correct documentation for %pK
Merge upstream-f2fs-stable-linux-4.9.y into android-4.9
* BACKPORT: filemap: add a comment about FAULT_FLAG_RETRY_NOWAIT behavior
mm/filemap.c
* BACKPORT: filemap: drop the mmap_sem for all blocking operations
mm/filemap.c
* BACKPORT: filemap: kill page_cache_read usage in filemap_fault
include/linux/pagemap.h
mm/filemap.c
* ANDROID: binder: remove extra declaration left after backport
drivers/android/binder.c
* UPSTREAM: net: socket: set sock->sk to NULL after calling proto_ops::release()
net/socket.c
* FROMGIT: binder: fix BUG_ON found by selinux-testsuite
drivers/android/binder.c
ANDROID: dm-bow: Fix 32 bit compile errors
* ANDROID: fix 4.9 backport of psi header refactoring
kernel/sched/core.c
* UPSTREAM: mm: proc: smaps_rollup: fix pss_locked calculation
fs/proc/task_mmu.c
* UPSTREAM: binder: fix handling of misaligned binder object
drivers/android/binder.c
UPSTREAM: binder: fix sparse issue in binder_alloc_selftest.c
* BACKPORT: binder: use userspace pointer as base of buffer space
drivers/android/binder.c
drivers/android/binder_alloc.c
drivers/android/binder_alloc.h
drivers/android/binder_trace.h
* UPSTREAM: binder: fix kerneldoc header for struct binder_buffer
drivers/android/binder_alloc.h
* BACKPORT: binder: remove user_buffer_offset
drivers/android/binder.c
drivers/android/binder_alloc.c
drivers/android/binder_alloc.h
* UPSTREAM: binder: remove kernel vm_area for buffer space
drivers/android/binder_alloc.c
* UPSTREAM: binder: avoid kernel vm_area for buffer fixups
drivers/android/binder.c
* BACKPORT: binder: add function to copy binder object from buffer
drivers/android/binder.c
* BACKPORT: binder: add functions to copy to/from binder buffers
drivers/android/binder.c
drivers/android/binder_alloc.c
drivers/android/binder_alloc.h
* UPSTREAM: binder: create userspace-to-binder-buffer copy function
drivers/android/binder.c
drivers/android/binder_alloc.c
drivers/android/binder_alloc.h
ANDROID: Add dm-bow to cuttlefish configuration
ANDROID: dm-bow: Backport to 4.9
ANDROID: dm-bow: backport to 4.14
* ANDROID: dm-bow: Add dm-bow feature
drivers/md/Kconfig
drivers/md/Makefile
* f2fs: set pin_file under CAP_SYS_ADMIN
fs/f2fs/file.c
* f2fs: fix to avoid deadlock in f2fs_read_inline_dir()
fs/f2fs/inline.c
* f2fs: fix to adapt small inline xattr space in __find_inline_xattr()
fs/f2fs/xattr.c
* f2fs: fix to do sanity check with inode.i_inline_xattr_size
fs/f2fs/inode.c
fs/f2fs/super.c
fs/f2fs/xattr.h
* f2fs: give some messages for inline_xattr_size
fs/f2fs/super.c
* f2fs: don't trigger read IO for beyond EOF page
fs/f2fs/data.c
* f2fs: fix to add refcount once page is tagged PG_private
fs/f2fs/checkpoint.c
fs/f2fs/data.c
fs/f2fs/dir.c
fs/f2fs/f2fs.h
fs/f2fs/node.c
fs/f2fs/segment.c
* f2fs: remove wrong comment in f2fs_invalidate_page()
fs/f2fs/data.c
* f2fs: fix to use kvfree instead of kzfree
fs/f2fs/xattr.c
* f2fs: print more parameters in trace_f2fs_map_blocks
include/trace/events/f2fs.h
* f2fs: trace f2fs_ioc_shutdown
fs/f2fs/file.c
include/trace/events/f2fs.h
* f2fs: fix to avoid deadlock of atomic file operations
fs/f2fs/segment.c
* f2fs: fix to dirty inode for i_mode recovery
fs/f2fs/file.c
* f2fs: give random value to i_generation
fs/f2fs/f2fs.h
fs/f2fs/namei.c
fs/f2fs/super.c
* f2fs: no need to take page lock in readdir
fs/f2fs/dir.c
* f2fs: fix to update iostat correctly in IPU path
fs/f2fs/segment.c
* f2fs: fix encrypted page memory leak
fs/f2fs/data.c
* f2fs: make fault injection covering __submit_flush_wait()
fs/f2fs/segment.c
* f2fs: fix to retry fill_super only if recovery failed
fs/f2fs/super.c
* f2fs: silence VM_WARN_ON_ONCE in mempool_alloc
fs/f2fs/data.c
* f2fs: correct spelling mistake
include/linux/f2fs_fs.h
* f2fs: fix wrong #endif
fs/f2fs/f2fs.h
* f2fs: don't clear CP_QUOTA_NEED_FSCK_FLAG
fs/f2fs/checkpoint.c
* f2fs: don't allow negative ->write_io_size_bits
fs/f2fs/super.c
* f2fs: fix to check inline_xattr_size boundary correctly
fs/f2fs/f2fs.h
fs/f2fs/super.c
include/linux/f2fs_fs.h
* Revert "f2fs: fix to avoid deadlock of atomic file operations"
fs/f2fs/segment.c
* Revert "f2fs: fix to check inline_xattr_size boundary correctly"
fs/f2fs/f2fs.h
fs/f2fs/super.c
include/linux/f2fs_fs.h
f2fs: do not use mutex lock in atomic context
* f2fs: fix potential data inconsistence of checkpoint
fs/f2fs/data.c
fs/f2fs/f2fs.h
fs/f2fs/file.c
fs/f2fs/inline.c
* f2fs: fix to avoid deadlock of atomic file operations
fs/f2fs/segment.c
* f2fs: fix to check inline_xattr_size boundary correctly
fs/f2fs/f2fs.h
fs/f2fs/super.c
include/linux/f2fs_fs.h
* f2fs: jump to label 'free_node_inode' when failing from d_make_root()
fs/f2fs/super.c
f2fs: fix to document inline_xattr_size option
* f2fs: fix to data block override node segment by mistake
fs/f2fs/super.c
* f2fs: fix typos in code comments
include/linux/f2fs_fs.h
* f2fs: use xattr_prefix to wrap up
fs/f2fs/xattr.c
* f2fs: sync filesystem after roll-forward recovery
fs/f2fs/checkpoint.c
fs/f2fs/node.c
fs/f2fs/super.c
* fs: export evict_inodes
fs/inode.c
fs/internal.h
include/linux/fs.h
* f2fs: flush quota blocks after turnning it off
fs/f2fs/super.c
* f2fs: avoid null pointer exception in dcc_info
fs/f2fs/f2fs.h
* f2fs: don't wake up too frequently, if there is lots of IOs
fs/f2fs/segment.h
* f2fs: try to keep CP_TRIMMED_FLAG after successful umount
fs/f2fs/segment.c
* f2fs: add quick mode of checkpoint=disable for QA
fs/f2fs/checkpoint.c
fs/f2fs/f2fs.h
fs/f2fs/file.c
fs/f2fs/segment.c
fs/f2fs/super.c
include/linux/f2fs_fs.h
* f2fs: run discard jobs when put_super
fs/f2fs/f2fs.h
fs/f2fs/segment.c
fs/f2fs/super.c
fs/f2fs/sysfs.c
* f2fs: fix to set sbi dirty correctly
fs/f2fs/f2fs.h
* f2fs: UBSAN: set boolean value iostat_enable correctly
fs/f2fs/sysfs.c
* f2fs: add brackets for macros
fs/f2fs/f2fs.h
* f2fs: check if file namelen exceeds max value
fs/f2fs/dir.c
* f2fs: fix to trigger fsck if dirent.name_len is zero
fs/f2fs/dir.c
* f2fs: no need to check return value of debugfs_create functions
fs/f2fs/debug.c
fs/f2fs/f2fs.h
fs/f2fs/super.c
* f2fs: export FS_NOCOW_FL flag to user
fs/f2fs/f2fs.h
fs/f2fs/file.c
* f2fs: check inject_rate validity during configuring
fs/f2fs/sysfs.c
* f2fs: remove set but not used variable 'err'
fs/f2fs/data.c
* f2fs: fix compile warnings: 'struct *' declared inside parameter list
include/trace/events/f2fs.h
* f2fs: change error code to -ENOMEM from -EINVAL
fs/f2fs/super.c
Change-Id: I199547b8a925245ea0fd613296fc5cedb762c5f6
Signed-off-by: Petri Gynther <pgynther@google.com>
2019-03-29 16:45:44 -07:00
..
2016-08-24 22:34:19 +02:00
2016-10-11 09:57:17 +02:00
2018-03-23 11:25:09 -07:00
2017-01-12 11:39:07 +01:00
2018-01-23 19:57:08 +01:00
2016-08-25 20:03:51 +02:00
2019-01-26 09:38:34 +01:00
2019-02-12 19:44:52 +01:00
2018-05-30 07:50:39 +02:00
2015-07-13 13:32:00 -04:00
2016-09-21 13:56:55 -04:00
2016-02-26 15:30:20 +00:00
2018-05-30 07:50:37 +02:00
2016-07-15 23:34:14 +02:00
2016-04-06 14:06:48 +01:00
2016-11-11 08:12:37 -08:00
2014-08-20 16:03:45 +02:00
2018-06-13 23:25:03 -07:00
2015-04-13 21:03:02 +09:30
2016-08-08 15:22:37 -07:00
2016-08-08 15:22:37 -07:00
2016-08-08 15:22:37 -07:00
2015-09-28 01:31:48 -06:00
2016-08-28 11:08:34 +02:00
2019-03-29 16:45:44 -07:00
2019-01-13 10:03:48 +01:00
2015-06-04 07:37:37 +02:00
2018-11-28 17:35:40 -08:00
2018-02-28 15:09:57 -08:00
2017-12-14 09:28:22 +01:00
2018-02-04 21:39:49 -08:00
2019-02-12 19:44:58 +01:00
2018-09-15 09:43:01 +02:00
2015-02-16 17:56:04 -08:00
2016-05-14 09:56:56 -06:00
2018-03-23 11:25:09 -07:00
2014-08-20 16:03:45 +02:00
2016-07-17 14:08:12 -03:00
2015-09-25 16:31:45 +01:00
2015-04-15 14:01:12 +02:00
2015-10-21 15:18:36 +01:00
2016-02-26 15:32:05 +00:00
2016-09-19 14:49:08 -07:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2016-08-08 17:49:05 -07:00
2014-08-20 16:03:45 +02:00
2019-02-27 23:18:44 -08:00
2014-08-20 16:03:45 +02:00
2016-11-09 22:28:05 +01:00
2016-09-23 10:35:32 +02:00
2016-07-17 14:02:45 -03:00
2016-08-26 17:39:34 -07:00
2016-05-24 14:12:48 +10:00
2014-10-14 09:22:26 +02:00
2014-12-20 00:01:12 +01:00
2016-02-26 15:30:20 +00:00
2016-04-07 21:57:16 +01:00
2018-12-26 20:53:09 -08:00
2018-02-25 11:05:47 +01:00
2015-08-16 22:11:16 -06:00
2016-05-13 14:02:05 +02:00
2015-09-04 16:54:41 -07:00
2018-04-17 10:33:48 -07:00
2016-06-07 22:57:10 +02:00
2016-07-07 15:58:45 +02:00
2018-11-23 08:20:35 +01:00
2017-01-27 13:52:26 -08:00
2016-01-28 11:40:32 +01:00
2017-11-24 16:56:41 +08:00
2018-03-23 11:25:09 -07:00
2018-12-08 13:05:04 +01:00
2015-04-02 16:42:08 +02:00
2016-10-10 14:51:44 -07:00
2014-11-26 14:36:52 +01:00
2018-11-23 08:20:35 +01:00
2018-08-17 21:31:08 +02:00
2018-11-23 08:20:35 +01:00
2017-01-27 13:52:26 -08:00
2018-12-18 09:41:22 -08:00
2014-08-27 21:54:11 +09:30
2016-11-11 08:45:08 -08:00
2014-08-20 16:03:45 +02:00
2014-08-20 16:03:45 +02:00
2015-06-23 13:35:47 +09:00
2018-01-17 09:38:58 +01:00
2016-03-15 16:55:16 -07:00
2014-08-20 16:03:45 +02:00
2016-02-09 10:09:52 -08:00
2018-02-28 15:09:57 -08:00
2015-11-03 10:45:26 -05:00
2016-10-07 18:46:30 -07:00
2017-10-12 15:29:11 -07:00
2016-06-14 13:18:33 +01:00
2016-03-23 16:00:46 +01:00
2014-10-14 02:18:23 +02:00
2016-10-07 18:46:30 -07:00
2015-08-28 17:04:40 +02:00
2015-08-28 17:04:40 +02:00
2018-04-13 19:48:21 +02:00
2018-12-08 13:05:05 +01:00
2016-08-31 13:59:31 +02:00
2015-03-16 14:49:13 +00:00
2014-08-20 16:03:45 +02:00