Age | Commit message (Collapse) | Author |
|
0b79b93 net: ipc_router: Bind only a client port as control port
3ff7459 ashmem: Validate ashmem memory with fops pointer
Linux version 3.4.0-g0b79b93 (android-build@wpds15.hot.corp.google.com)
(gcc version 4.8 (GCC) )
#1 SMP PREEMPT Tue Aug 9 18:23:34 UTC 2016 ( mnc-mr1 )
Bug: 27045580
Bug: 30652312
Change-Id: I99bd5e9183e2439771cd52a9880b9907ebf7c914
Source-Branch: android-msm-flo-3.4-mnc-mr1
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
9330d06 fs: ext4: disable support for fallocate FALLOC_FL_PUNCH_HOLE
cd09a79 UPSTREAM: ALSA: control: Fix replacing user controls
30f8747 msm: camera: Fix memory read by adding bounds check
7f1eabb1 UPSTREAM: KEYS: close race between key lookup and freeing
a3cd7a5 BACKPORT: netfilter: x_tables: validate e->target_offset early
fd689aa UPSTREAM: netfilter: x_tables: make sure e->next_offset covers remaining blob size
f063cd2 BACKPORT: KEYS: potential uninitialized variable
69c41cd UPSTREAM: ipv4: try to cache dst_entries which would cause a redirect
7ce8f030 BACKPORT: ipv6: Don't reduce hop limit for an interface
7a9cc42 UPSTREAM: udp: fix behavior of wrong checksums
2bfbb38 UPSTREAM: ppp: take reference on channels netns
6e52bd4 UPSTREAM: netfilter: x_tables: fix unconditional helper
f25b13d UPSTREAM: unix: avoid use-after-free in ep_remove_wait_queue
3b37580 spmi: prevent showing the address of spmidev
07ce5d0 Merge branch 'android-msm-flo-3.4-mnc-mr1' into android-msm-flo-3.4-mnc-mr1-security-next
509794e Merge remote-tracking branch 'remotes/msm-asus/android-msm-flo-3.4-mnc-mr1' into android-msm-flo-3.4-mnc-mr1-security-next
152abf0 flo_defconfig: disable CONFIG_OABI_COMPAT
Linux version 3.4.0-g9330d06 (android-build@wpiv4.hot.corp.google.com)
(gcc version 4.8 (GCC) )
#1 SMP PREEMPT Wed Jul 20 21:27:18 UTC 2016 ( mnc-mr1 )
Bug: 28522518
Bug: 28760453
Bug: 28760543
Bug: 28815326
Bug: 28940694
Bug: 28979703
Bug: 29119002
Bug: 29409847
Bug: 29506807
Bug: 29507402
Bug: 29510361
Bug: 29637687
Bug: 29823941
Bug: 29916012
Change-Id: I3f8e35fffd8cff475d72e6aaf2de1097ba353547
Source-Branch: android-msm-flo-3.4-mnc-mr1
Signed-off-by: Thierry Strudel <tstrudel@google.com>
|
|
ad29d11 qseecom: initialize data->type on device open
Linux version 3.4.0-gad29d11 (android-build@vpea2.mtv.corp.google.com)
(gcc version 4.8 (GCC) )
#1 SMP PREEMPT Sat Jul 2 00:00:53 UTC 2016 ( mnc-mr1 )
Bug: 28747998
Bug: 29821509
Bug: 29872309
Change-Id: I46ddfc90707d9c00505bd365354abb0c6e142232
Source-Branch: android-msm-flo-3.4-mnc-mr1
Signed-off-by: Thierry Strudel <tstrudel@google.com>
|
|
dc18eac UPSTREAM: vfs: make AIO use the proper rw_verify_area() area helpers
a63a290 flo_defconfig: enable SECURITY_PERF_EVENTS_RESTRICT
91d6204 ANDROID: restrict access to perf events
6301d0d FROMLIST: security,perf: Allow further restriction of perf_event_open
c38786a BACKPORT: perf tools: Document the perf sysctls
96981f7 UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_ccallback
4cb76bd UPSTREAM: ALSA: timer: Fix leak in events via snd_timer_user_tinterrupt
4bf9389 UPSTREAM: ALSA: timer: Fix leak in SNDRV_TIMER_IOCTL_PARAMS
fdc6183 UPSTREAM: ALSA: timer: Fix race among timer ioctls
d5127da ipv6: add complete rcu protection around np->opt
f426a67 BACKPORT: usbnet: cleanup after bind() in probe()
cd169f7 flo_defconfig: disable CONFIG_OABI_COMPAT
b1d288e net: validate the range we feed to iov_iter_init() in sys_sendto/sys_recvfrom
beeda1a fix infoleak in rtnetlink
17b1ccf USB: usbfs: fix potential infoleak in devio
93c8c4a msm: kgsl: Defer adding the mem entry to a process
Linux version 3.4.0-gdc18eac (android-build@wpiu3.hot.corp.google.com)
(gcc version 4.8 (GCC) )
#1 SMP PREEMPT Tue Jun 21 23:12:56 UTC 2016 ( mnc-mr1 )
Bug: 28026365
Bug: 28522518
Bug: 28619695
Bug: 28620102
Bug: 28694392
Bug: 28744625
Bug: 28746669
Bug: 28759139
Bug: 28939037
Bug: 28980217
Bug: 28980557
Bug: 29054680
Bug: 29119870
Change-Id: I9b009ce496f98029dba472367fde92c8d1695468
Source-Branch: android-msm-flo-3.4-mnc-mr1
Signed-off-by: Thierry Strudel <tstrudel@google.com>
|
|
1fc765b Don't show empty tag stats for unprivileged uids
Linux version 3.4.0-g1fc765b (android-build@wped21.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT
Wed Jun 8 18:49:02 UTC 2016 (mnc-mr1)
Bug: 27532522
Bug: 27577101
Change-Id: I92848619807b52569b5a8635cec187e4f17e18ff
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
624b54b tty: Fix unsafe ldisc reference via ioctl(TIOCGETD)
066b756 Replace %p with %pK to prevent leaking kernel address
8afa5f8 msm: perf: Do not allocate new hw_event if event is duplicate.
dc901a5 USB: fix invalid memory access in hub_activate()
877f6d8 msm: camera: sensor: Validate step_boundary
4c291fb mmc: core : fix arbitrary read/write to user space
1e2f4fc n_tty: Fix n_tty_write crash when echoing in raw mode
d910042 msm: vidc: Validate userspace buffer count
26eed7f msm: vidc: Validate userspace buffer count before using it
37836aa qseecom: Validate the incoming length from user space
6e653ff msm: actuator: fix to prevent kernel heap buffer overflow
f601636 diag: Fix for diag debugfs buffer overflow
8064a62 From a7502f4f801bb95bff73617309835bb7a016cde5 Mon Sep 17 00:00:00 2001 From: Xu Han <hanxu@codeaurora.org> Date: Wed, 25 Sep 2013 15:28:32 -0700 Subject: msm: camera: Checking an enum value greater than zero
2021b89 msm: camera: Fix various small issues in cci driver
451ba15 msm: camera: Fix various small issues in Actuator driver
93999e6 msm: ipc: Detect integer overflow before it happens
82e4047 msm: ipc: Add check to avoid integer & buffer overflow
18cd721 Add bounds check before copying data to prevent buffer overflow.
0ac643a qseecom: Change __copy_from_user to copy_from_user
b350fa1 wlan: Userspace data copy fix
Linux version 3.4.0-g624b54b (android-build@kpfk2.cbf.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Tue May 24 22:17:36 UTC 2016 (mnc-mr1)
Bug: 27532522
Bug: 27890772
Bug: 28409131
Bug: 28410333
Bug: 28430703
Bug: 28431531
Bug: 28441831
Bug: 28442449
Bug: 28469042
Bug: 28557260
Bug: 28571496
Bug: 28598501
Bug: 28598515
Bug: 28712303
Bug: 28769136
Bug: 28803396
Change-Id: I3b992f4e3d29bb1199b2b6ee758b7a4d297daf2e
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
09a22c6 msm: kgsl: Add missing checks for alloc size and sglen
Bug: 27475454
Linux version 3.4.0-g09a22c6 (android-build@wpdv14.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Wed Apr 20 00:06:25 UTC 2016
Change-Id: Ie327988d7f9da7b0d426e56ecf565d4dadbff783
Signed-off-by: Yuan Lin <yualin@google.com>
|
|
1683ab8 msm: display: Validate MDP, MDDI and HDMI reg offset bugfix
02f6246 msm_fb: display: Enable display debugging through mdp debugfs
0cd7924 msm: display: Validate MDP, MDDI and HDMI debug reg offset
972c638 pipe: iovec: Fix OOB read in pipe_read()
243408c qcacld 2.0: Address buffer overflow due to invalid length
34953f9 qcacld 2.0: Validate WPA and RSN IE for valid length
973503f wlan:Check priviledge permission
aaf7476 wlan:Check priviledge permission
ede034f wlan:Check priviledge permission
4a75c96 wlan:Check priviledge permission
86fd66a wlan:Check priviledge permission
518fd80 wlan:Check priviledge permission
fbb8f12 wlan:Check priviledge permission
fd13b59 wlan:Check priviledge permission before processing
e9dcd5a wlan:Check priviledge permission before processing
1fac733 wlan:Check priviledge permission before processing
2ab7501 Revert "Keep history after reset to 094b859"
Bug: 27721803
Bug: 26754117
Bug: 27104184
Bug: 27104184
Bug: 27104184
Bug: 27104184
Bug: 27104184
Bug: 27104184
Bug: 27104184
Bug: 27104184
Bug: 27104184
Bug: 27104184
Bug: 27104184
Linux version 3.4.0-g1683ab8 (android-build@kpfk13.cbf.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Fri Mar 25 07:50:48 UTC 2016
Change-Id: I15dfed3a7d7b05b823310a05f9a8c8efdd2a52db
Signed-off-by: Yuan Lin <yualin@google.com>
|
|
2ab7501 Revert "Keep history after reset to 094b859"
eca06b4 pipe: iovec: Fix memory corruption when retrying atomic copy as non-atomic
c97b5c0 Keep history after reset to 094b859
Bug: 27275324
Linux version 3.4.0-g2ab7501 (android-build@wpee6.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Tue Mar 22 17:53:43 UTC 2016 (MR1)
Change-Id: I7ed2c6b682146475228970c62db49f43376d1869
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
6b5cc17 msm: perf: validate input argument of ev_constraints functions
Bug: 27096908
Linux version 3.4.0-g6b5cc17 (android-build@vpbs20.mtv.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Wed Feb 24 07:54:59 UTC 2016
Change-Id: I3a6bc98bc4caa23a56c0748039f4577b5280405c
Signed-off-by: Yuan Lin <yualin@google.com>
|
|
094b859 msm: null pointer dereferencing
Bug: 25364034
Linux version 3.4.0-g094b859 (android-build@wpds5.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Thu Jan 21 23:31:37 UTC 2016
Change-Id: Ifd120256e13e4af5b74f5a1304837ed327a9c9b4
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
8ba2631 mm: fix prctl_set_vma_anon_name
a314b7c flo: update build.config for MNC MR1 branch
Bug: 20017123
Linux version 3.4.0-g8ba2631 (android-build@kpfj14.cbf.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Mon Oct 26 06:21:20 UTC 2015
Change-Id: I2d3cd83bbffd1efb650f76f95798d0eb5ba1d80d
Signed-off-by: Ed Tam <etam@google.com>
|
|
4b3d11e msm: ipc_socket: fix leak of kernel memory to userspace
bd8d871 arm/configs: flo: Remove SysV IPC from kernel
Bug: 24157888
Bug: 24551430
Bug: 22300191
Linux version 3.4.0-g4b3d11e (android-build@vpak12.mtv.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Thu Oct 15 21:35:13 UTC 2015
Change-Id: I8a1e805ebc8db586ecc363ca917fdaa100d5fd04
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
8ba2631 mm: fix prctl_set_vma_anon_name
a314b7c flo: update build.config for MNC MR1 branch
Bug: 20017123
Linux version 3.4.0-g8ba2631 (android-build@kpfj14.cbf.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Mon Oct 26 06:21:20 UTC 2015
Change-Id: I2d3cd83bbffd1efb650f76f95798d0eb5ba1d80d
Signed-off-by: Ed Tam <etam@google.com>
|
|
am: 9ec6511640 -s ours
* commit '9ec651164006c6d7d314a6f3a771032522cfed84':
flo: update prebuilt kernel [DO NOT MERGE]
|
|
a257609 msm: ipc_socket: fix leak of kernel memory to userspace
034b3a1 arm/configs: flo: Remove SysV IPC from kernel
2256139 Update build.config for android-msm-flo-3.4-mnc
Bug: 24157888
Bug: 24551430
Bug: 22300191
Linux version 3.4.0-ga257609 (android-build@wpix7.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Thu Oct 15 23:11:00 UTC 2015
Change-Id: I328016f1ee8e6cf2bb1b81e67d9a807485e54cfa
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
4b3d11e msm: ipc_socket: fix leak of kernel memory to userspace
bd8d871 arm/configs: flo: Remove SysV IPC from kernel
Bug: 24157888
Bug: 24551430
Bug: 22300191
Linux version 3.4.0-g4b3d11e (android-build@vpak12.mtv.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Thu Oct 15 21:35:13 UTC 2015
Change-Id: I8a1e805ebc8db586ecc363ca917fdaa100d5fd04
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
automerge: ec7728182c
* commit 'ec7728182c5bbbd6951263667c43eca40b1780c7':
flo: update prebuilt kernel
|
|
automerge: a5d6247bde
* commit 'a5d6247bde8e2e1e0539752f122565da5f58bae8':
flo: update prebuilt kernel
|
|
automerge: df4da2cf12 -s ours
* commit 'df4da2cf12b94241f23ab42217927ed3eccadbd0':
flo: update prebuilt kernel
|
|
automerge: 6fe682dd7d
* commit '6fe682dd7d5db0545aeabcc1a8983ca268ceda46':
flo: update prebuilt kernel
|
|
automerge: f13b9ee8de
* commit 'f13b9ee8dec8dcb97928b4dcdd58e04ba5252e5e':
flo: update prebuilt kernel
|
|
automerge: d7e39a5553 -s ours
* commit 'd7e39a55533fd55cc0213978f8ad7fceadee4b3e':
flo: update prebuilt kernel
|
|
automerge: 99c97663a7
* commit '99c97663a70c6303a6ce5336aef91059ae2bbfb7':
flo: update prebuilt kernel
|
|
automerge: df80797d50
* commit 'df80797d50acc5c513e02026a5f577eae4631c6e':
flo: update prebuilt kernel
|
|
automerge: e437f2b6b5 -s ours
* commit 'e437f2b6b5e39da334104cacdc5cfa4966daa71e':
flo: update prebuilt kernel
|
|
a5a4133 msm: display: remove warning messages for bandwidth calculation
Bug: 11324320
Linux version 3.4.0-ga5a4133 (android-build@wpix7.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Mon Aug 17 21:50:19 UTC 2015
Change-Id: Ia49306aead0ff1e5151549056dc6d36582159e30
Signed-off-by: Ed Tam <etam@google.com>
|
|
Reinstate the following commits:
fe3bd61 mmc: add force poweroff notify and sw reset for some card
077e222 flo/deb: keypad: set powerkey button to have reset notification
cc8e142 keys: notify system preparing to force reset if resetkey is defined
---------
fa95477 Revert "Revert "mmc: add force poweroff notify and sw reset for some card""
943aa09 Revert "Revert "flo/deb: keypad: set powerkey button to have reset notification""
d202ff9 Revert "Revert "keys: notify system preparing to force reset if resetkey is defined""
Bug: 20770158
Linux version 3.4.0-gfa95477 (android-build@wpiv14.hot.corp.google.com)
(gcc version 4.6.x-google 20120106 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Aug 14 17:29:03 UTC 2015
Change-Id: I2a84a9c5ff2e3cbef65d8e7432f28f82afedbfb7
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
Remove the following commits:
fe3bd61 mmc: add force poweroff notify and sw reset for some card
077e222 flo/deb: keypad: set powerkey button to have reset notification
cc8e142 keys: notify system preparing to force reset if resetkey is defined
--------
32e5fbc Revert "keys: notify system preparing to force reset if resetkey is defined"
4533557 Revert "flo/deb: keypad: set powerkey button to have reset notification"
4dc06fd Revert "mmc: add force poweroff notify and sw reset for some card"
Bug: 20770158
Linux version 3.4.0-g32e5fbc (android-build@vpec9.mtv.corp.google.com)
(gcc version 4.6.x-google 20120106 (prerelease) (GCC) ) #1 SMP PREEMPT Fri Aug 14 17:00:06 UTC 2015
Change-Id: Id477b507362c250e77628b0394ec63501bb22433
Signed-off-by: Patrick Tjin <pattjin@google.com>
|
|
3bcea4e msm: kgsl: Increase the wait timeout for context detachment
ab98584 ipv6: sysctl to restrict candidate source addresses
Linux version 3.4.0-g3bcea4e (android-build@wpix2.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Wed Jul 29 16:34:04 UTC 2015
Bug: 19470192
Bug: 21832279
Bug: 22464419
Change-Id: Icac0e98b0011e345d3685a2e14994d302a380c61
Signed-off-by: Thierry Strudel <tstrudel@google.com>
|
|
8aa6344 ipv4: Missing sk_nulls_node_init() in ping_unhash().
Linux version 3.4.0-g8aa6344 (android-build@vpec6.mtv.corp.google.com)
(gcc version 4.6.x-google 20120106 (prerelease) (GCC) )
Bug: 20770158
Change-Id: I4cd31ecb98d3b33cdb3e51d91fed3146dce587a3
Signed-off-by: Thierry Strudel <tstrudel@google.com>
|
|
edee5ca prima: release v3.2.3.23
Linux version 3.4.0-gedee5ca (android-build@wpix12.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Sat Jul 25 06:41:10 UTC 2015
Bug: 22128497
Change-Id: I8ac3fee2e00a745182744e828cd190fadaa82c48
Signed-off-by: Thierry Strudel <tstrudel@google.com>
|
|
381ca1f proc: Allow proc_free_inum to be called from any context
60e6a98 proc: Usable inode numbers for the namespace file descriptors.
dadd033 proc: Fix the namespace inode permission checks.
75140a9 proc: Generalize proc inode allocation
5fe7ef9 vfs: Allow unprivileged manipulation of the mount namespace.
38d441b vfs: Only support slave subtrees across different user namespaces
6f52736 vfs: Add a user namespace reference from struct mnt_namespace
cd0ed7c vfs: Add setns support for the mount namespace
5f453c9 consitify do_mount() arguments
57e87fa do_add_mount()/umount -l races
32d9bbb fs: introduce inode operation ->update_time
a6e63b0 VFS: Comment mount following code
4270022 VFS: Make clone_mnt()/copy_tree()/collect_mounts() return errors
ba25d8c get rid of magic in proc_namespace.c
0c0d145 get rid of ->mnt_longterm
6855270 vfs: umount_tree() might be called on subtree that had never made it
f875ea3 brlocks/lglocks: API cleanups
3e8176d brlocks/lglocks: turn into functions
fcb98c4 lglock: remove online variants of lock
a9c44d5 Revert "vfs: umount_tree() might be called on subtree that had never made it"
0f7aa3c Revert "get rid of ->mnt_longterm"
Linux version 3.4.0-g381ca1f (android-build@vpef15.mtv.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Mon Jul 13 22:44:05 UTC 2015
Bug: 22173056
Change-Id: I2d8fa663b0cb83804fee695c5e503cf8cb3050a9
Signed-off-by: Thierry Strudel <tstrudel@google.com>
|
|
f06badf msm_vidc: Fix for DRC in Adative Mode
14de53c arm/configs: flo: add CONFIG_NF, savedefconfig
Bug: 20895249
Linux version 3.4.0-gf06badf (android-build@wpiy15.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Mon Jul 13 00:37:57 UTC 2015
Change-Id: I3e4dbcc9b3c0484ac1c565280405dd8fe5813af1
Signed-off-by: Ed Tam <etam@google.com>
|
|
992fe3c ptrace: fix ptrace defect cause by a merge fail
Bug: 22300656
Linux version 3.4.0-g992fe3c (android-build@wpiz9.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Mon Jul 6 21:14:17 UTC 2015
Change-Id: I1a7ad89c86c259953cffba6201726c8b517711bb
Signed-off-by: Ed Tam <etam@google.com>
|
|
51f2ffd mm: reorder can_do_mlock to fix audit denial
f8da52f Perf: Fix the condition to toggle PMU IRQ when CPUs are hotplugged.
Bug: 19590990
Linux version 3.4.0-g51f2ffd (android-build@wpiu5.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Wed Jun 17 06:23:10 UTC 2015
Change-Id: Ia14a6b731ff80b784d2a7d820c89747f8b052217
Signed-off-by: Ed Tam <etam@google.com>
|
|
fe2cff8 android: drivers: workaround debugfs race in binder
e70d64c selinux: correctly label /proc inodes in use before the policy is loaded
Linux version 3.4.0-gfe2cff8 (android-build@wpiv15.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Tue Jun 2 19:43:20 UTC 2015
Bug: 19587483
Bug: 21324807
Change-Id: Ie225208b912ac73aee91a59a308a999ad696b151
Signed-off-by: Thierry Strudel <tstrudel@google.com>
|
|
0950a9d flo_defconfig: enable UID_CPUTIME
bbd4380 hashtable: introduce a small and naive hashtable
6684fc8 proc: uid: Changes the thread notifier to profile event notifier.
9580994 proc: uid_cputime: fix show_uid_stat permission
479c753 proc: uid: Adds accounting for the cputimes per uid.
Bug: 19808833
Linux version 3.4.0-g0950a9d (android-build@wpix2.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Fri May 29 01:43:04 UTC 2015
Change-Id: I3def5b5cb4c9dd23d075a230210637f413e6cc4a
Signed-off-by: Ed Tam <etam@google.com>
|
|
automerge: eb58e2f -s ours automerge: d032a16 -s ours automerge: b65fafe -s ours
automerge: af21638 -s ours
* commit 'af21638f30e75999bd419838da755cbb3912983c':
flo: update prebuilt kernel [DO NOT MERGE]
|
|
automerge: eb58e2f -s ours automerge: d032a16 -s ours
automerge: b65fafe -s ours
* commit 'b65fafefa640846d782ad14352942be0e06ca7c5':
flo: update prebuilt kernel [DO NOT MERGE]
|
|
automerge: eb58e2f -s ours
automerge: d032a16 -s ours
* commit 'd032a16d585679f8b9c3a30ae5b83b012b60c148':
flo: update prebuilt kernel [DO NOT MERGE]
|
|
automerge: eb58e2f -s ours
* commit 'eb58e2f0219802863eedb6904201d413fc3d4569':
flo: update prebuilt kernel [DO NOT MERGE]
|
|
automerge: 0d7a841 -s ours
* commit '0d7a8410dc7edfdd9c8150eae511b586425aba8e':
flo: update prebuilt kernel [DO NOT MERGE]
|
|
fe3bd61 mmc: add force poweroff notify and sw reset for some card
077e222 flo/deb: keypad: set powerkey button to have reset notification
cc8e142 keys: notify system preparing to force reset if resetkey is defined
Bug: 20214206
Linux version 3.4.0-gfe3bd61 (android-build@vpeb12.mtv.corp.google.com)
(gcc version 4.6.x-google 20120106 (prerelease) (GCC) ) #1 SMP PREEMPT
Wed May 27 22:29:37 UTC 2015
Change-Id: I5a9daf947b41c9c795f7961ec6bcc9de6a539688
Signed-off-by: Ed Tam <etam@google.com>
|
|
80c6845 neigh: Better handling of transition to NUD_PROBE state
Linux version 3.4.0-g80c6845 (android-build@wpix7.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Mon May 25 03:46:54 UTC 2015
Bug: 18581716
Change-Id: Ie6de9738b71a35e67f159121f893961b580b1990
|
|
86e3b85 Set the iif for IPv6 packets as well.
73c45b6 net: ping: Return EAFNOSUPPORT when appropriate.
fd60bfc tcp: resets are misrouted
bd1fd73 net: ipv4: tcp: Get tcpi_count via file_count() not direct access
aa57899 um: add missing declaration of 'getrlimit()' and friends
7dde482 flo: Put device-specific code behind #ifndef CONFIG_UML.
Linux version 3.4.0-g86e3b85 (android-build@wpiz6.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Wed May 20 08:17:26 UTC 2015
Bug: 19842347
Change-Id: I129f20df82e12af7c7c81dbf695c833393dc374c
|
|
e4aab2e get rid of ->mnt_longterm
a24df44 vfs: umount_tree() might be called on subtree that had never made it
BUG: 20426708
Change-Id: Ie265f62c88b3cd6a8c4eadaa28139fd9ca65aafa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
|
|
10d7287 mmc: add force poweroff notify and sw reset for some card
5a3b5a9 flo/deb: keypad: set powerkey button to have reset notification
040354b keys: notify system preparing to force reset if resetkey is defined
Bug: 20214206
Linux version 3.4.0-g10d7287 (android-build@kpfk8.cbf.corp.google.com)
(0gcc version 4.8 (GCC) ) #1 SMP PREEMPT Fri May 15 22:44:54 UTC 2015
Change-Id: I200ec3c28b62b26680380489cbf8066cb7b14845
Signed-off-by: Ed Tam <etam@google.com>
|
|
b5b6b5c SELinux: ss: Fix policy write for ioctl operations
3191179 ipv4: Missing sk_nulls_node_init() in ping_unhash().
Bug: 20717709
Bug: 20770158
Linux version 3.4.0-gb5b6b5c (android-build@wped2.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Thu May 7 00:39:58 UTC 2015
Change-Id: Ie8ba0e406c134c12317b978a38b6b937c8187d21
Signed-off-by: Ed Tam <etam@google.com>
|
|
a0504d7 SELinux: use deletion-safe iterator to free list
Linux version 3.4.0-ga0504d7 (android-build@wpiy14.hot.corp.google.com)
(gcc version 4.8 (GCC) ) #1 SMP PREEMPT Wed Apr 22 21:05:01 UTC 2015
Bug: 20457636
Change-Id: I5fd228759111059399e014cf9fb7e5a52810bd02
Signed-off-by: Thierry Strudel <tstrudel@google.com>
|