Kevin Hilman 4dddf72053 Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android ...

Conflicts:
	fs/exec.c

 Resolution summary:

    Conflict between upstream/LTS commit 9eae8ac6ab (fs: take
    i_mutex during prepare_binprm for set[ug]id executables) and
    android commit 9d0ff694bc (sched: move no_new_privs into new
    atomic flags).  Resolution: move task_no_new_privs() usage into
    new function created by upstream/LTS comit.

2015-08-14 09:55:00 -07:00

..

netfilter

Merge branch 'linaro-android-3.10-lsk' of

2015-03-16 15:52:47 +08:00

af_inet.c

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2013-10-14 11:27:26 +01:00

ah4.c

net: Add skb_unclone() helper function.

2013-02-15 15:10:37 -05:00

arp.c

firewire net, ipv4 arp: Extend hardware address and remove driver-level packet inspection.

2013-03-26 12:32:13 -04:00

cipso_ipv4.c

cipso: don't follow a NULL pointer when setsockopt() is called

2012-07-18 09:01:12 -07:00

datagram.c

ipv4: fix a race in ip4_datagram_release_cb()

2014-06-26 15:12:38 -04:00

devinet.c

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-03-09 07:33:42 +00:00

esp4.c

esp4: fix error return code in esp_output()

2013-04-15 14:05:34 -04:00

fib_frontend.c

Merge branch 'linaro-android-3.10-lsk' of

2015-03-16 15:52:47 +08:00

fib_lookup.h

ipv4: Fix nexthop caching wrt. scoping.

2011-03-24 18:06:47 -07:00

fib_rules.c

ipv4: Fix incorrect error code when adding an unreachable route

2014-12-06 15:05:46 -08:00

fib_semantics.c

Merge branch 'linaro-android-3.10-lsk' of

2015-03-16 15:52:47 +08:00

fib_trie.c

fib_trie: remove potential out of bound access

2013-09-14 06:54:54 -07:00

gre.c

gre: fix a possible skb leak

2013-06-25 16:07:44 -07:00

icmp.c

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2014-07-29 13:55:15 +08:00

igmp.c

inetpeer: get rid of ip_id_count

2014-08-14 09:24:15 +08:00

inet_connection_sock.c

net: core: Support UID-based routing.

2014-06-25 12:41:52 +09:00

inet_diag.c

inet_diag: fix possible overflow in inet_diag_dump_one_icsk()

2015-03-26 15:00:55 +01:00

inet_fragment.c

inet: frag: make sure forced eviction removes all frags

2014-04-14 06:42:15 -07:00

inet_hashtables.c

net: do not call sock_put() on TIMEWAIT sockets

2013-11-04 04:31:00 -08:00

inet_lro.c

ipv4: replace ip_fast_csum with csum_replace2

2013-03-15 09:12:25 -04:00

inet_timewait_sock.c

hlist: drop the node parameter from iterators

2013-02-27 19:10:24 -08:00

inetpeer.c

inetpeer: get rid of ip_id_count

2014-08-14 09:24:15 +08:00

ip_forward.c

ip_forward: Drop frames with attached skb->sk

2015-05-06 21:56:20 +02:00

ip_fragment.c

ipv4: ip_check_defrag should not assume that skb_network_offset is zero

2015-03-18 13:22:26 +01:00

ip_gre.c

gre: don't allow to add the same tunnel twice

2014-05-30 21:52:14 -07:00

ip_input.c

net: Fix memory leak if TPROXY used with TCP early demux

2014-02-06 11:08:17 -08:00

ip_options.c

ipv4: fix buffer overflow in ip_options_compile()

2014-07-28 08:00:06 -07:00

ip_output.c

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

2015-03-19 08:57:07 +08:00

ip_sockglue.c

ip: zero sockaddr returned on error queue

2015-02-26 17:48:47 -08:00

ip_tunnel.c

inetpeer: get rid of ip_id_count

2014-08-14 09:24:15 +08:00

ip_vti.c

vti: don't allow to add the same tunnel twice

2014-05-30 21:52:15 -07:00

ipcomp.c

xfrm: allow to avoid copying DSCP during encapsulation

2013-03-06 07:02:45 +01:00

ipconfig.c

ipconfig: add informative timeout messages while waiting for carrier

2013-04-02 14:35:33 -04:00

ipip.c

ipip, sit: fix ipv4_{update_pmtu,redirect} calls

2014-06-26 15:12:38 -04:00

ipmr.c

Merge branch 'linaro-android-3.10-lsk' of

2015-03-16 15:52:47 +08:00

Kconfig

Tunneling: use IP Tunnel stats APIs.

2013-03-26 12:27:19 -04:00

Makefile

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

2013-07-01 13:40:20 -07:00

netfilter.c

netfilter: add my copyright statements

2013-04-18 20:27:55 +02:00

ping.c

ipv4: Missing sk_nulls_node_init() in ping_unhash().

2015-05-13 05:15:41 -07:00

proc.c

net: Add MIB counters for checksum errors

2013-04-29 15:14:03 -04:00

protocol.c

ipv4: Disallow non-namespace aware protocols to register.

2013-02-05 14:42:23 -05:00

raw.c

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

2014-09-08 12:05:48 +01:00

route.c

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

2015-08-14 09:55:00 -07:00

syncookies.c

net: core: Support UID-based routing.

2014-06-25 12:41:52 +09:00

sysctl_net_ipv4.c

Merge remote-tracking branch 'lsk/v3.10/topic/aosp' into linux-linaro-lsk-android

2014-06-12 11:22:36 +01:00

sysfs_net_ipv4.c

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

2013-07-01 13:40:20 -07:00

tcp_bic.c

tcp: fix undo after RTO for BIC

2012-01-20 14:17:26 -05:00

tcp_cong.c

tcp: remove Appropriate Byte Count support

2013-02-05 14:51:16 -05:00

tcp_cubic.c

tcp_cubic: fix the range of delayed_ack

2014-05-30 21:52:16 -07:00

tcp_diag.c

inet_diag: Rename inet_diag_req into inet_diag_req_v2

2012-01-11 12:56:06 -08:00

tcp_fastopen.c

tcp: TCP Fast Open Server - header & support functions

2012-08-31 20:02:18 -04:00

tcp_highspeed.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_htcp.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_hybla.c

tcp: bool conversions

2012-05-17 14:59:59 -04:00

tcp_illinois.c

remove extra definitions of U32_MAX

2015-04-29 10:33:54 +02:00

tcp_input.c

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

2015-05-12 15:18:24 +08:00

tcp_ipv4.c

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

2015-05-12 15:18:24 +08:00

tcp_lp.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

tcp_memcontrol.c

net: tcp_memcontrol: minor: remove unused variable

2013-04-14 15:41:49 -04:00

tcp_metrics.c

tcp: metrics: Avoid duplicate entries with the same destination-IP

2014-02-06 11:08:16 -08:00

tcp_minisocks.c

tcp: reset timer after any SYNACK retransmit

2013-04-29 15:14:03 -04:00

tcp_output.c

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

2015-05-12 15:18:24 +08:00

tcp_probe.c

net: proc: change proc_net_remove to remove_proc_entry

2013-02-18 14:53:08 -05:00

tcp_scalable.c

tcp: mark tcp_congestion_ops read_mostly

2011-03-10 00:40:17 -08:00

tcp_timer.c

tcp: refactor F-RTO

2013-03-21 11:47:50 -04:00

tcp_vegas.c

tcp: Fix integer-overflow in TCP vegas

2014-08-14 09:24:15 +08:00

tcp_vegas.h

[TCP]: congestion control API pass RTT in microseconds

2007-07-31 02:27:57 -07:00

tcp_veno.c

tcp: Fix integer-overflows in TCP veno

2014-08-14 09:24:15 +08:00

tcp_westwood.c

tcp: refactor F-RTO

2013-03-21 11:47:50 -04:00

tcp_yeah.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

tcp.c

Merge branch 'linaro-android-3.10-lsk' of git://android.git.linaro.org/kernel/linaro-android into linux-linaro-lsk-android

2015-04-17 13:40:43 +08:00

tunnel4.c

net: Convert printks to pr_<level>

2012-03-11 23:42:51 -07:00

udp_diag.c

udp_diag: Fix socket skipping within chain

2015-02-26 17:48:48 -08:00

udp_impl.h

ipv4: fix checkpatch errors

2012-04-15 12:37:19 -04:00

udp.c

Merge branch 'linux-linaro-lsk-v3.10' into linux-linaro-lsk-v3.10-android

2015-08-14 09:55:00 -07:00

udplite.c

net: ipv4: Standardize prefixes for message logging

2012-03-12 17:05:21 -07:00

xfrm4_input.c

net: Add skb_unclone() helper function.

2013-02-15 15:10:37 -05:00

xfrm4_mode_beet.c

ipsec: be careful of non existing mac headers

2012-02-23 16:50:45 -05:00

xfrm4_mode_transport.c

[IPSEC]: Use IPv6 calling convention as the convention for x->mode->output

2007-10-10 16:55:54 -07:00

xfrm4_mode_tunnel.c

inetpeer: get rid of ip_id_count

2014-08-14 09:24:15 +08:00

xfrm4_output.c

xfrm4: Don't call icmp_send on local error

2011-07-01 17:33:19 -07:00

xfrm4_policy.c

xfrm: Increase the garbage collector threshold

2015-07-03 19:48:09 -07:00

xfrm4_state.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

xfrm4_tunnel.c

net: ipv4: Standardize prefixes for message logging

2012-03-12 17:05:21 -07:00