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

..

netfilter

netfilter: on sockopt() acquire sock lock only in the required scope

2018-02-25 11:03:37 +01:00

addrconf_core.c

ipv6: change ipv6_stub_impl.ipv6_dst_lookup to take net argument

2015-07-31 15:21:30 -07:00

addrconf.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-10-04 12:03:25 +08:00

addrlabel.c

ipv6/addrlabel: fix ip6addrlbl_get()

2015-12-22 15:57:54 -05:00

af_inet6.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2018-01-22 11:50:22 +05:30

ah6.c

net: inet: Support UID-based routing in IP protocols.

2017-01-02 14:44:15 +05:30

anycast.c

ipv6: coding style: comparison for equality with NULL

2015-03-31 13:51:54 -04:00

datagram.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-07-11 16:22:22 +08:00

esp6.c

net: inet: Support UID-based routing in IP protocols.

2017-01-02 14:44:15 +05:30

exthdrs_core.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2016-04-21 14:08:44 +08:00

exthdrs_offload.c

ipv6: fix exthdrs offload registration in out_rt path

2015-09-02 15:31:00 -07:00

exthdrs.c

ipv6: add complete rcu protection around np->opt

2015-12-02 23:37:16 -05:00

fib6_rules.c

ipv6: Do not leak throw route references

2017-07-05 14:37:14 +02:00

icmp.c

net: inet: Support UID-based routing in IP protocols.

2017-01-02 14:44:15 +05:30

ila.c

dst: Pass net into dst->output

2015-10-08 04:27:03 -07:00

inet6_connection_sock.c

net: inet: Support UID-based routing in IP protocols.

2017-01-02 14:44:15 +05:30

inet6_hashtables.c

net: SO_INCOMING_CPU setsockopt() support

2015-10-12 19:28:20 -07:00

ip6_checksum.c

udp: Generic functions to set checksum

2014-06-04 22:46:38 -07:00

ip6_fib.c

UPSTREAM: ipv6: fib: Unlink replaced routes from their nodes

2017-10-15 23:28:32 +05:30

ip6_flowlabel.c

ipv6: flowlabel: do not leave opt->tot_len with garbage

2017-11-18 11:11:06 +01:00

ip6_gre.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2018-03-05 20:20:17 +05:30

ip6_icmp.c

ipv6: White-space cleansing : Line Layouts

2014-08-24 22:37:52 -07:00

ip6_input.c

netfilter: Pass net into okfn

2015-09-17 17:18:37 -07:00

ip6_offload.c

ipv6: Fix leak in ipv6_gso_segment().

2017-06-14 13:16:19 +02:00

ip6_offload.h

ipv6: Pull IPv6 GSO registration out of the module

2012-11-15 17:39:24 -05:00

ip6_output.c

Merge tag 'lsk-v4.4-18.02-android' of git://git.linaro.org/kernel/linux-linaro-stable.git

2018-02-07 20:59:20 +08:00

ip6_tunnel.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2018-03-05 20:20:17 +05:30

ip6_udp_tunnel.c

vxlan: do not receive IPv4 packets on IPv6 socket

2015-08-29 13:07:54 -07:00

ip6_vti.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2018-03-05 20:20:17 +05:30

ip6mr.c

ip6mr: fix stale iterator

2018-02-16 20:09:37 +01:00

ipcomp6.c

net: inet: Support UID-based routing in IP protocols.

2017-01-02 14:44:15 +05:30

ipv6_sockglue.c

netfilter: drop outermost socket lock in getsockopt()

2018-02-28 10:17:21 +01:00

Kconfig

net: replace dst_cache ip6_tunnel implementation with the generic one

2018-02-25 11:03:34 +01:00

Makefile

net: Identifier Locator Addressing module

2015-08-17 21:33:06 -07:00

mcast_snoop.c

net: fix wrong skb_get() usage / crash in IGMP/MLD parsing code

2015-08-13 17:08:39 -07:00

mcast.c

ipv6: mcast: better catch silly mtu values

2018-01-02 20:33:24 +01:00

mip6.c

ipv6: use ktime_t for internal timestamps

2015-10-05 03:16:47 -07:00

ndisc.c

net: ipv6: Add sysctl for minimum prefix len acceptable in RIOs.

2017-04-10 13:12:16 +05:30

netfilter.c

net: inet: Support UID-based routing in IP protocols.

2017-01-02 14:44:15 +05:30

output_core.c

ipv6: accept 64k - 1 packet length in ip6_find_1stfragopt()

2017-09-27 11:00:10 +02:00

ping.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-07-11 16:22:22 +08:00

proc.c

udp: Increment UDP_MIB_IGNOREDMULTI for arriving unmatched multicasts

2014-11-07 15:45:50 -05:00

protocol.c

net: Export inet_offloads and inet6_offloads

2014-09-19 17:15:31 -04:00

raw.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-07-11 16:22:22 +08:00

reassembly.c

Revert "net: fix percpu memory leaks"

2017-09-27 11:00:11 +02:00

route.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2018-03-05 20:20:17 +05:30

sit.c

ip_tunnel: replace dst_cache with generic implementation

2018-02-28 10:17:21 +01:00

syncookies.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-08-17 14:18:51 +05:30

sysctl_net_ipv6.c

ipv6: Implement different admin modes for automatic flow labels

2015-07-31 17:07:11 -07:00

tcp_ipv6.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2018-01-22 11:50:22 +05:30

tcpv6_offload.c

tcp: cleanup static functions

2015-02-28 16:56:51 -05:00

tunnel6.c

ipv6: fix tunnel error handling

2015-11-03 10:52:13 -05:00

udp_impl.h

net: Remove iocb argument from sendmsg and recvmsg

2015-03-02 13:06:31 -05:00

udp_offload.c

net: avoid skb_warn_bad_offload false positives on UFO

2017-08-12 19:29:08 -07:00

udp.c

Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android

2017-11-20 20:53:19 +05:30

udplite.c

net: Eliminate no_check from protosw

2014-05-23 16:28:53 -04:00

xfrm6_input.c

netfilter: Pass struct net into the netfilter hooks

2015-09-17 17:18:37 -07:00

xfrm6_mode_beet.c

xfrm: simplify xfrm_address_t use

2015-03-31 13:58:35 -04:00

xfrm6_mode_ro.c

ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()

2017-06-14 13:16:19 +02:00

xfrm6_mode_transport.c

ipv6: xfrm: Handle errors reported by xfrm6_find_1stfragopt()

2017-06-14 13:16:19 +02:00

xfrm6_mode_tunnel.c

ipv6: update skb->csum when CE mark is propagated

2016-01-31 11:29:01 -08:00

xfrm6_output.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2015-10-24 06:54:12 -07:00

xfrm6_policy.c

BACKPORT: net: xfrm: support setting an output mark.

2017-10-15 23:54:33 +05:30

xfrm6_protocol.c

xfrm6: Properly handle unsupported protocols

2014-05-06 07:08:38 +02:00

xfrm6_state.c

ipv6: White-space cleansing : Line Layouts

2014-08-24 22:37:52 -07:00

xfrm6_tunnel.c

ipv6: White-space cleansing : gaps between function and symbol export

2014-08-24 22:37:52 -07:00