Tao Huang 640193f76b Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux-linaro-stable.git ...

* linux-linaro-lsk-v4.4-android: (733 commits)
  LSK-ANDROID: memcg: Remove wrong ->attach callback
  LSK-ANDROID: arm64: mm: Fix __create_pgd_mapping() call
  ANDROID: sdcardfs: Move default_normal to superblock
  blkdev: Refactoring block io latency histogram codes
  FROMLIST: arm64: kpti: Fix the interaction between ASID switching and software PAN
  FROMLIST: arm64: Move post_ttbr_update_workaround to C code
  FROMLIST: arm64: mm: Rename post_ttbr0_update_workaround
  sched: EAS: Initialize push_task as NULL to avoid direct reference on out_unlock path
  fscrypt: updates on 4.15-rc4
  ANDROID: uid_sys_stats: fix the comment
  BACKPORT: tee: indicate privileged dev in gen_caps
  BACKPORT: tee: optee: sync with new naming of interrupts
  BACKPORT: tee: tee_shm: Constify dma_buf_ops structures.
  BACKPORT: tee: optee: interruptible RPC sleep
  BACKPORT: tee: optee: add const to tee_driver_ops and tee_desc structures
  BACKPORT: tee.txt: standardize document format
  BACKPORT: tee: add forward declaration for struct device
  BACKPORT: tee: optee: fix uninitialized symbol 'parg'
  BACKPORT: tee: add ARM_SMCCC dependency
  BACKPORT: selinux: nlmsgtab: add SOCK_DESTROY to the netlink mapping tables
  ...

Conflicts:
	arch/arm64/kernel/vdso.c
	drivers/usb/host/xhci-plat.c
	include/drm/drmP.h
	include/linux/kasan.h
	kernel/time/timekeeping.c
	mm/kasan/kasan.c
	security/selinux/nlmsgtab.c

Also add this commit:
0bcdc0987c ("time: Fix ktime_get_raw() incorrect base accumulation")

2018-01-26 19:26:47 +08:00

..

netfilter

netfilter: nf_nat_snmp: Fix panic when snmp_trap_helper fails to register

2017-12-25 14:22:13 +01:00

af_inet.c

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

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

ah4.c

IPsec: do not ignore crypto err in ah4 input

2017-11-15 17:13:10 +01:00

arp.c

NET: Fix /proc/net/arp for AX.25

2017-06-17 06:39:35 +02:00

cipso_ipv4.c

tcp/dccp: fix ireq->opt races

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

datagram.c

net: Set sk_txhash from a random number

2015-07-29 22:44:04 -07:00

devinet.c

ipv4: igmp: guard against silly MTU values

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

esp4.c

esp4: Fix integrity verification when ESN are used

2016-12-10 19:07:26 +01:00

fib_frontend.c

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

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

fib_lookup.h

ipv4: consider TOS in fib_select_default

2015-07-24 22:46:11 -07:00

fib_rules.c

net: ipv6: use common fib_default_rule_pref

2015-09-09 14:19:50 -07:00

fib_semantics.c

ipv4: fix NULL dereference in free_fib_info_rcu()

2017-08-30 10:19:18 +02:00

fib_trie.c

net: Improve handling of failures on link and route dumps

2017-06-07 12:05:58 +02:00

fou.c

net: add recursion limit to GRO

2016-11-15 07:46:38 +01:00

gre_demux.c

gre: Remove support for sharing GRE protocol hook.

2015-08-10 14:03:54 -07:00

gre_offload.c

net: add recursion limit to GRO

2016-11-15 07:46:38 +01:00

icmp.c

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

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

igmp.c

net: igmp: Use correct source address on IGMPv3 reports

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

inet_connection_sock.c

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

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

inet_diag.c

net: inet: diag: expose the socket mark to privileged processes.

2016-10-12 17:34:22 +05:30

inet_fragment.c

Revert "net: use lib/percpu_counter API for fragmentation mem accounting"

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

inet_hashtables.c

tcp/dccp: fix hashdance race for passive sessions

2015-10-23 05:42:21 -07:00

inet_lro.c

lro: remove dead code

2013-12-29 16:34:25 -05:00

inet_timewait_sock.c

tcp/dccp: fix timewait races in timer handling

2015-09-21 16:32:29 -07:00

inetpeer.c

net: Add helper function to compare inetpeer addresses

2015-08-28 13:32:36 -07:00

ip_forward.c

net: Pass net into dst_output and remove dst_output_okfn

2015-10-08 04:26:54 -07:00

ip_fragment.c

inet: frag: release spinlock before calling icmp_send()

2017-12-25 14:22:11 +01:00

ip_gre.c

vxlan, gre, geneve: Set a large MTU on ovs-created tunnel devices

2016-06-24 10:18:18 -07:00

ip_input.c

ipv4: Pass struct net into ip_defrag and ip_check_defrag

2015-10-12 19:44:16 -07:00

ip_options.c

ipv4: coding style: comparison for inequality with NULL

2015-04-03 12:11:15 -04:00

ip_output.c

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

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

ip_sockglue.c

net: Allow IP_MULTICAST_IF to set index to L3 slave

2017-11-30 08:37:26 +00:00

ip_tunnel_core.c

tunnels: Remove encapsulation offloads on decap.

2016-10-31 04:13:59 -06:00

ip_tunnel.c

ipv4: igmp: guard against silly MTU values

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

ip_vti.c

vti: fix use after free in vti_tunnel_xmit/vti6_tnl_xmit

2017-10-21 17:09:02 +02:00

ipcomp.c

ipv4: coding style: comparison for equality with NULL

2015-04-03 12:11:15 -04:00

ipconfig.c

ipconfig: send Client-identifier in DHCP requests

2015-10-18 19:23:52 -07:00

ipip.c

ipip: only increase err_count for some certain type icmp in ipip_err

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

ipmr.c

ipmr, ip6mr: fix scheduling while atomic and a deadlock with ipmr_get_route

2016-11-15 07:46:37 +01:00

Kconfig

net: diag: Support destroying TCP sockets.

2016-04-07 16:49:53 +05:30

Makefile

sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size

2016-02-16 13:51:15 -08:00

netfilter.c

ipv4: Pass struct net into ip_route_me_harder

2015-09-29 20:21:32 +02:00

ping.c

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

2017-05-04 12:01:39 +08:00

proc.c

net: track success and failure of TCP PMTU probing

2015-07-21 22:36:33 -07: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

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

route.c

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

2017-12-19 13:08:40 +08:00

syncookies.c

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

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

sysctl_net_ipv4.c

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

2016-11-15 18:33:34 +05:30

sysfs_net_ipv4.c

sysfs_net_ipv4: Add sysfs-based knobs for controlling TCP window size

2016-02-16 13:51:15 -08:00

tcp_bic.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_cdg.c

tcp: do not slow start when cwnd equals ssthresh

2015-07-09 14:22:52 -07:00

tcp_cong.c

tcp: disallow cwnd undo when switching congestion control

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

tcp_cubic.c

tcp_cubic: do not set epoch_start in the future

2015-09-17 22:35:07 -07:00

tcp_dctcp.c

dctcp: avoid bogus doubling of cwnd after loss

2016-11-21 10:06:39 +01:00

tcp_diag.c

net: diag: Support destroying TCP sockets.

2016-04-07 16:49:53 +05:30

tcp_fastopen.c

tcp: initialize max window for a new fastopen socket

2017-02-04 09:45:09 +01:00

tcp_highspeed.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_htcp.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_hybla.c

tcp: do not slow start when cwnd equals ssthresh

2015-07-09 14:22:52 -07:00

tcp_illinois.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_input.c

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

2018-01-26 19:26:47 +08:00

tcp_ipv4.c

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

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

tcp_lp.c

tcp: fix wraparound issue in tcp_lp

2017-05-14 13:32:58 +02:00

tcp_memcontrol.c

memcg: cleanup static keys decrement

2015-02-12 18:54:10 -08:00

tcp_metrics.c

tcp: convert cached rtt from usec to jiffies when feeding initial rto

2016-04-20 15:41:56 +09:00

tcp_minisocks.c

tcp: do not inherit fastopen_req from parent

2017-05-14 13:32:58 +02:00

tcp_offload.c

tcp: reserve tcp_skb_mss() to tcp stack

2015-06-11 16:33:10 -07:00

tcp_output.c

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

2017-11-26 12:03:21 +08:00

tcp_probe.c

tcp: whitespace fixes

2014-09-01 18:12:45 -07:00

tcp_recovery.c

tcp: use RACK to detect losses

2015-10-21 07:00:53 -07:00

tcp_scalable.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_timer.c

net: fix keepalive code vs TCP_FASTOPEN_CONNECT

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

tcp_vegas.c

tcp: fix under-evaluated ssthresh in TCP Vegas

2017-12-25 14:22:15 +01:00

tcp_vegas.h

tcp: prepare CC get_info() access from getsockopt()

2015-04-29 17:10:38 -04:00

tcp_veno.c

tcp: add tcp_in_slow_start helper

2015-07-09 14:22:52 -07:00

tcp_westwood.c

tcp_westwood: fix tcp_westwood_info()

2015-05-05 19:50:09 -04:00

tcp_yeah.c

tcp: cwnd does not increase in TCP YeAH

2016-09-30 10:18:34 +02:00

tcp.c

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

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

tunnel4.c

…

udp_diag.c

net: inet: diag: expose the socket mark to privileged processes.

2016-10-12 17:34:22 +05:30

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_tunnel.c

tunnel: Clear IPCB(skb)->opt before dst_link_failure called

2016-04-20 15:41:56 +09:00

udp.c

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

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

udplite.c

net: Eliminate no_check from protosw

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

xfrm4_input.c

netfilter: Pass net into okfn

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

xfrm4_mode_beet.c

ipv4: ERROR: code indent should use tabs where possible

2013-12-26 13:43:21 -05:00

xfrm4_mode_transport.c

…

xfrm4_mode_tunnel.c

ipv4: hash net ptr into fragmentation bucket selection

2015-03-25 14:07:04 -04:00

xfrm4_output.c

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

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

xfrm4_policy.c

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

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

xfrm4_protocol.c

xfrm4: Remove duplicate semicolon

2014-06-30 07:49:47 +02:00

xfrm4_state.c

inet: make no_pmtu_disc per namespace and kill ipv4_config

2013-12-18 16:58:20 -05:00

xfrm4_tunnel.c

sit: add IPv4 over IPv4 support

2013-05-31 17:19:05 -07:00