Amit Pundir c8f435d8fd
Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android ...
* linux-linaro-lsk-v4.4: (783 commits)
Linux 4.4.159
iw_cxgb4: only allow 1 flush on user qps
HID: sony: Support DS4 dongle
HID: sony: Update device ids
arm64: Add trace_hardirqs_off annotation in ret_to_user
ext4: don't mark mmp buffer head dirty
ext4: fix online resizing for bigalloc file systems with a 1k block size
ext4: fix online resize's handling of a too-small final block group
ext4: recalucate superblock checksum after updating free blocks/inodes
ext4: avoid divide by zero fault when deleting corrupted inline directories
tty: vt_ioctl: fix potential Spectre v1
drm/nouveau/drm/nouveau: Use pm_runtime_get_noresume() in connector_detect()
ocfs2: fix ocfs2 read block panic
scsi: target: iscsi: Use hex2bin instead of a re-implementation
neighbour: confirm neigh entries when ARP packet is received
net: hp100: fix always-true check for link up state
net/appletalk: fix minor pointer leak to userspace in SIOCFINDIPDDPRT
ipv6: fix possible use-after-free in ip6_xmit()
gso_segment: Reset skb->mac_len after modifying network header
mm: shmem.c: Correctly annotate new inodes for lockdep
...
Conflicts:
Makefile
fs/squashfs/block.c
include/uapi/linux/prctl.h
kernel/fork.c
kernel/sys.c
Trivial merge conflicts in above files. Resolved by rebasing
corresponding AOSP changes.
arch/arm64/mm/init.c
Pick the changes from upstream version of AOSP patch
"arm64: check for upper PAGE_SHIFT bits in pfn_valid" instead.
Signed-off-by: Amit Pundir <amit.pundir@linaro.org >
2018-10-03 15:00:28 +05:30
2015-04-11 22:28:27 -04:00
2018-07-03 11:21:35 +02:00
2015-02-20 17:35:14 -05:00
2014-12-10 15:33:16 -05:00
2015-09-21 16:03:04 -07:00
2018-02-16 20:09:40 +01:00
2018-08-24 13:26:53 +02:00
2018-09-29 03:08:51 -07:00
2012-06-17 16:29:38 -07:00
2017-10-21 17:09:01 +02:00
2015-09-18 21:59:31 +02:00
2015-10-21 00:49:25 +02:00
2015-08-26 11:01:44 -07:00
2017-05-15 17:32:20 +08:00
2015-09-17 13:20:05 +02:00
2013-07-31 17:50:01 -07:00
2016-09-30 10:18:36 +02:00
2018-08-22 07:48:35 +02:00
2014-09-18 10:54:36 +02:00
2018-01-31 12:06:14 +01:00
2011-11-30 18:51:03 -05:00
2015-06-28 16:55:44 -07:00
2015-11-02 22:52:24 -05:00
2014-11-10 13:27:49 -05:00
2015-07-27 01:05:24 -07:00
2016-04-20 15:42:04 +09:00
2014-01-13 17:39:11 +01:00
2011-08-08 14:26:29 -04:00
2018-04-13 19:50:00 +02:00
2015-09-30 13:16:44 +02:00
2015-08-17 21:33:06 -07:00
2017-02-18 16:39:26 +01:00
2015-07-20 12:41:30 -07:00
2016-05-18 17:06:39 -07:00
2015-04-09 00:02:26 -04:00
2014-02-09 17:32:50 -08:00
2013-12-06 12:37:56 -05:00
2015-03-06 21:50:02 -05:00
2013-12-10 21:50:00 -05:00
2013-09-20 14:49:32 -04:00
2015-09-17 17:18:37 -07:00
2013-09-20 14:49:32 -04:00
2014-02-09 17:32:49 -08:00
2014-02-09 17:32:49 -08:00
2015-11-01 15:56:11 -05:00
2013-01-09 23:59:53 -08:00
2018-02-25 11:03:34 +01:00
2016-03-03 15:07:04 -08:00
2015-10-08 04:27:02 -07:00
2017-06-07 12:05:59 +02:00
2013-11-07 19:28:58 -05:00
2015-09-23 15:33:15 -07:00
2017-01-02 14:06:47 +05:30
2013-03-26 12:32:13 -04:00
2015-09-01 16:46:08 -07:00
2017-01-02 14:44:15 +05:30
2014-02-12 07:02:11 +01:00
2014-11-12 15:01:35 -05:00
2013-09-20 14:49:33 -04:00
2014-09-30 01:02:26 -04:00
2017-12-05 11:22:49 +01:00
2015-08-27 15:42:48 -07:00
2015-08-10 14:03:54 -07:00
2015-08-31 15:17:17 -07:00
2014-11-05 16:30:03 -05:00
2013-09-20 14:49:33 -04:00
2014-02-06 09:34:58 +01:00
2015-09-30 13:16:44 +02:00
2017-04-10 13:29:27 +05:30
2015-10-03 04:32:42 -07:00
2015-03-18 22:00:35 -04:00
2015-11-02 22:46:09 -05:00
2016-03-03 15:07:07 -08:00
2016-01-31 11:29:01 -08:00
2017-09-27 11:00:11 +02:00
2015-10-23 05:42:21 -07:00
2017-11-18 11:11:07 +01:00
2018-05-16 10:06:50 +02:00
2015-12-16 00:14:12 -05:00
2014-08-24 18:09:23 -07:00
2017-09-27 11:00:10 +02:00
2017-07-22 12:02:06 +08:00
2018-02-25 11:03:34 +01:00
2018-05-30 07:49:04 +02:00
2018-02-28 10:17:21 +01:00
2016-05-11 11:21:09 +02:00
2018-06-11 16:48:21 +05:30
2010-02-16 23:05:38 -08:00
2018-07-25 10:18:16 +02:00
2014-11-24 04:28:49 -05:00
2017-08-11 09:08:56 -07:00
2017-10-15 23:54:09 +05:30
2013-09-21 14:01:38 -04:00
2014-10-14 02:18:27 +02:00
2013-09-21 14:01:38 -04:00
2013-09-21 14:01:38 -04:00
2014-12-10 15:21:24 -05:00
2018-05-30 07:49:06 +02:00
2013-09-21 14:01:38 -04:00
2014-01-01 22:22:43 -05:00
2013-09-21 14:01:38 -04:00
2013-09-21 14:01:38 -04:00
2014-12-10 15:21:24 -05:00
2013-09-21 14:01:38 -04:00
2018-08-22 07:48:35 +02:00
2015-10-08 04:27:03 -07:00
2018-05-30 07:48:59 +02:00
2015-10-21 00:49:24 +02:00
2013-12-06 12:37:56 -05:00
2014-09-22 16:23:15 -04:00
2015-10-23 06:26:42 -07:00
2014-11-05 23:52:33 -08:00
2013-10-01 17:06:14 -04:00
2015-12-01 15:07:59 -05:00
2015-08-10 13:46:21 -07:00
2018-08-24 13:26:53 +02:00
2011-05-27 13:41:33 -04:00
2013-09-21 14:01:39 -04:00
2014-08-07 20:55:21 -04:00
2018-02-25 11:03:51 +01:00
2014-02-08 10:36:58 -05:00
2013-09-21 14:01:39 -04:00
2018-05-16 10:06:50 +02:00
2015-09-30 13:16:44 +02:00
2013-09-21 14:01:39 -04:00
2015-03-02 13:06:31 -05:00
2014-10-06 18:02:32 -04:00
2015-08-27 14:18:48 -07:00
2014-05-23 16:28:53 -04:00
2013-09-23 01:51:08 -04:00
2013-09-23 01:51:08 -04:00
2013-09-23 01:51:08 -04:00
2018-02-25 11:03:40 +01:00
2018-05-30 07:49:00 +02:00
2015-10-16 00:52:19 -07:00
2013-09-23 01:51:08 -04:00
2018-06-11 16:48:21 +05:30
2015-10-21 19:15:20 -07:00
2017-08-30 10:19:21 +02:00
2016-03-03 15:07:05 -08:00
2014-06-02 11:00:41 -07:00
2018-04-24 09:32:04 +02:00
2014-10-15 07:48:18 +02:00
2017-01-02 14:06:41 +05:30
2013-12-19 18:51:20 -05:00
2013-09-23 01:51:09 -04:00
2016-06-24 10:18:16 -07:00
2013-10-21 18:43:02 -04:00
2015-03-12 22:58:12 -04:00
2018-10-03 15:00:28 +05:30
2015-07-09 15:12:20 -07:00
2014-01-19 19:53:18 -08:00
2015-10-26 22:24:22 -07:00
2015-08-29 13:07:54 -07:00
2016-10-12 17:34:22 +05:30
2018-03-11 16:19:46 +01:00
2013-07-27 22:14:06 -07:00
2015-12-05 18:15:29 -05:00
2013-09-23 16:29:40 -04:00
2014-09-05 17:35:28 -07:00
2018-04-13 19:50:07 +02:00
2010-04-22 16:12:36 -07:00
2017-10-15 23:54:33 +05:30
c8f435d8fd