iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
linux/net/ipv4
History
Linus Torvalds 229aebb873 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial 
* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (39 commits)
  Update broken web addresses in arch directory.
  Update broken web addresses in the kernel.
  Revert "drivers/usb: Remove unnecessary return's from void functions" for musb gadget
  Revert "Fix typo: configuation => configuration" partially
  ida: document IDA_BITMAP_LONGS calculation
  ext2: fix a typo on comment in ext2/inode.c
  drivers/scsi: Remove unnecessary casts of private_data
  drivers/s390: Remove unnecessary casts of private_data
  net/sunrpc/rpc_pipe.c: Remove unnecessary casts of private_data
  drivers/infiniband: Remove unnecessary casts of private_data
  drivers/gpu/drm: Remove unnecessary casts of private_data
  kernel/pm_qos_params.c: Remove unnecessary casts of private_data
  fs/ecryptfs: Remove unnecessary casts of private_data
  fs/seq_file.c: Remove unnecessary casts of private_data
  arm: uengine.c: remove C99 comments
  arm: scoop.c: remove C99 comments
  Fix typo configue => configure in comments
  Fix typo: configuation => configuration
  Fix typo interrest[ing|ed] => interest[ing|ed]
  Fix various typos of valid in comments
  ...

Fix up trivial conflicts in:
	drivers/char/ipmi/ipmi_si_intf.c
	drivers/usb/gadget/rndis.c
	net/irda/irnet/irnet_ppp.c
2010-10-24 13:41:39 -07:00
..
netfilter
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
af_inet.c
net: build_ehash_secret() and rt_bind_peer() cleanups
2010-08-20 00:50:16 -07:00
ah4.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
arp.c
neigh: Protect neigh->ha[] with a seqlock
2010-10-11 12:54:04 -07:00
cipso_ipv4.c
Update broken web addresses in the kernel.
2010-10-18 11:03:14 +02:00
datagram.c
net: return operator cleanup
2010-09-23 14:33:39 -07:00
devinet.c
inet: RCU changes in inetdev_by_index()
2010-10-19 03:50:48 -07:00
esp4.c
xfrm: SA lookups signature with mark
2010-02-22 16:20:22 -08:00
fib_frontend.c
net: avoid a dev refcount in ip_mc_find_dev()
2010-10-19 03:50:47 -07:00
fib_hash.c
fib: introduce fib_alias_accessed() helper
2010-10-21 03:09:41 -07:00
fib_lookup.h
fib: introduce fib_alias_accessed() helper
2010-10-21 03:09:41 -07:00
fib_rules.c
fib: RCU conversion of fib_lookup()
2010-10-05 20:39:38 -07:00
fib_semantics.c
fib: introduce fib_alias_accessed() helper
2010-10-21 03:09:41 -07:00
fib_trie.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
gre.c
gre: protocol table can be static
2010-10-03 21:50:51 -07:00
icmp.c
net: simplify flags for tx timestamping
2010-08-19 00:08:30 -07:00
igmp.c
inet: RCU changes in inetdev_by_index()
2010-10-19 03:50:48 -07:00
inet_connection_sock.c
net/ipv4: EXPORT_SYMBOL cleanups
2010-07-12 12:57:54 -07:00
inet_diag.c
net: return operator cleanup
2010-09-23 14:33:39 -07:00
inet_fragment.c
net/ipv4: EXPORT_SYMBOL cleanups
2010-07-12 12:57:54 -07:00
inet_hashtables.c
tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()
2010-10-21 13:06:43 +02:00
inet_lro.c
net/ipv4: Move && and || to end of previous line
2009-11-23 10:41:23 -08:00
inet_timewait_sock.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
inetpeer.c
inetpeer: restore small inet_peer structures
2010-06-16 11:55:39 -07:00
ip_forward.c
net-next: remove useless union keyword
2010-06-10 23:31:35 -07:00
ip_fragment.c
net: return operator cleanup
2010-09-23 14:33:39 -07:00
ip_gre.c
inet: RCU changes in inetdev_by_index()
2010-10-19 03:50:48 -07:00
ip_input.c
net: use this_cpu_ptr()
2010-06-28 23:24:29 -07:00
ip_options.c
bridge : Sanitize skb before it enters the IP stack
2010-09-19 12:42:34 -07:00
ip_output.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-09-27 01:03:03 -07:00
ip_sockglue.c
ipv4: enable getsockopt() for IP_NODEFRAG
2010-09-13 19:57:23 -07:00
ipcomp.c
xfrm: SA lookups signature with mark
2010-02-22 16:20:22 -08:00
ipconfig.c
ipconfig: send host-name in DHCP requests
2010-06-02 07:05:03 -07:00
ipip.c
net: add a core netdev->rx_dropped counter
2010-10-05 14:47:55 -07:00
ipmr.c
ipmr: cleanups
2010-10-03 21:50:53 -07:00
Kconfig
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
Makefile
PPTP: PPP over IPv4 (Point-to-Point Tunneling Protocol)
2010-08-21 23:05:39 -07:00
netfilter.c
Merge branch 'master' of /repos/git/net-next-2.6
2010-06-15 17:31:06 +02:00
proc.c
snmp: 64bit ipstats_mib for all arches
2010-06-30 13:31:19 -07:00
protocol.c
net: inet_add_protocol() can use cmpxchg()
2010-09-08 21:31:35 -07:00
raw.c
net: simplify flags for tx timestamping
2010-08-19 00:08:30 -07:00
route.c
net: avoid RCU for NOCACHE dst
2010-10-20 03:02:23 -07:00
syncookies.c
syncookies: add support for ECN
2010-06-26 22:00:03 -07:00
sysctl_net_ipv4.c
net: reserve ports for applications using fixed port numbers
2010-05-15 23:28:40 -07:00
tcp_bic.c
tcp: add helper for AI algorithm
2009-03-02 03:00:15 -08:00
tcp_cong.c
net/ipv4: Eliminate kstrdup memory leak
2010-08-27 19:31:56 -07:00
tcp_cubic.c
tcp: add helper for AI algorithm
2009-03-02 03:00:15 -08:00
tcp_diag.c
tcp: diag: Dont report negative values for rx queue
2009-12-03 16:06:13 -08:00
tcp_highspeed.c
[TCP]: Cong.ctrl modules: remove unused good_ack from cong_avoid
2008-01-28 14:55:41 -08:00
tcp_htcp.c
net/ipv4: Move && and || to end of previous line
2009-11-23 10:41:23 -08:00
tcp_hybla.c
TCP: tcp_hybla: Fix integer overflow in slow start increment
2010-06-02 07:15:48 -07:00
tcp_illinois.c
Update broken web addresses in the kernel.
2010-10-18 11:03:14 +02:00
tcp_input.c
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2010-10-24 13:41:39 -07:00
tcp_ipv4.c
tproxy: fix hash locking issue when using port redirection in __inet_inherit_port()
2010-10-21 13:06:43 +02:00
tcp_lp.c
net/ipv4: Move && and || to end of previous line
2009-11-23 10:41:23 -08:00
tcp_minisocks.c
net: return operator cleanup
2010-09-23 14:33:39 -07:00
tcp_output.c
net: return operator cleanup
2010-09-23 14:33:39 -07:00
tcp_probe.c
llseek: automatically add .llseek fop
2010-10-15 15:53:27 +02:00
tcp_scalable.c
tcp: add helper for AI algorithm
2009-03-02 03:00:15 -08:00
tcp_timer.c
tcp: use correct counters in CA_CWR state too
2010-10-17 13:46:33 -07:00
tcp_vegas.c
tcp: tcp_vegas ssthresh bugfix
2009-05-25 22:44:59 -07:00
tcp_vegas.h
…
tcp_veno.c
Update broken web addresses in the kernel.
2010-10-18 11:03:14 +02:00
tcp_westwood.c
net: return operator cleanup
2010-09-23 14:33:39 -07:00
tcp_yeah.c
net/ipv4: Move && and || to end of previous line
2009-11-23 10:41:23 -08:00
tcp.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-10-04 11:56:38 -07:00
tunnel4.c
tunnels: missing rcu_assign_pointer()
2010-09-09 15:02:39 -07:00
udp_impl.h
net: Make setsockopt() optlen be unsigned.
2009-09-30 16:12:20 -07:00
udp.c
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
2010-09-09 22:27:33 -07:00
udplite.c
net/ipv4: EXPORT_SYMBOL cleanups
2010-07-12 12:57:54 -07:00
xfrm4_input.c
net/ipv4: EXPORT_SYMBOL cleanups
2010-07-12 12:57:54 -07:00
xfrm4_mode_beet.c
ipsec: Interfamily IPSec BEET
2008-08-06 02:39:30 -07:00
xfrm4_mode_transport.c
…
xfrm4_mode_tunnel.c
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
2010-03-30 22:02:32 +09:00
xfrm4_output.c
netfilter: ipv4: use NFPROTO values for NF_HOOK invocation
2010-03-25 16:00:30 +01:00
xfrm4_policy.c
net dst: use a percpu_counter to track entries
2010-10-11 13:06:53 -07:00
xfrm4_state.c
xfrm: Allow different selector family in temporary state
2010-09-20 11:11:38 -07:00
xfrm4_tunnel.c
net: struct xfrm_tunnel in read_mostly section
2010-08-30 13:50:45 -07:00