Linus Torvalds
32aaeffbd4
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux ...
* 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux: (230 commits)
Revert "tracing: Include module.h in define_trace.h"
irq: don't put module.h into irq.h for tracking irqgen modules.
bluetooth: macroize two small inlines to avoid module.h
ip_vs.h: fix implicit use of module_get/module_put from module.h
nf_conntrack.h: fix up fallout from implicit moduleparam.h presence
include: replace linux/module.h with "struct module" wherever possible
include: convert various register fcns to macros to avoid include chaining
crypto.h: remove unused crypto_tfm_alg_modname() inline
uwb.h: fix implicit use of asm/page.h for PAGE_SIZE
pm_runtime.h: explicitly requires notifier.h
linux/dmaengine.h: fix implicit use of bitmap.h and asm/page.h
miscdevice.h: fix up implicit use of lists and types
stop_machine.h: fix implicit use of smp.h for smp_processor_id
of: fix implicit use of errno.h in include/linux/of.h
of_platform.h: delete needless include <linux/module.h>
acpi: remove module.h include from platform/aclinux.h
miscdevice.h: delete unnecessary inclusion of module.h
device_cgroup.h: delete needless include <linux/module.h>
net: sch_generic remove redundant use of <linux/module.h>
net: inet_timewait_sock doesnt need <linux/module.h>
...
Fix up trivial conflicts (other header files, and removal of the ab3550 mfd driver) in
- drivers/media/dvb/frontends/dibx000_common.c
- drivers/media/video/{mt9m111.c,ov6650.c}
- drivers/mfd/ab3550-core.c
- include/linux/dmaengine.h
2011-11-06 19:44:47 -08:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
ipv4: compat_ioctl is local to af_inet.c, make it static
2011-10-19 19:24:39 -04:00
inet: constify ip headers and in6_addr
2011-04-22 11:04:14 -07:00
neigh: Pass neighbour entry to output ops.
2011-07-17 23:11:17 -07:00
cipso: remove an unneeded NULL check in cipso_v4_doi_add()
2011-10-11 18:43:53 -04:00
ipv4: Lock socket and use cork flow in ip4_datagram_connect().
2011-05-08 13:48:57 -07:00
rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER
2011-08-02 04:29:23 -07:00
inet: constify ip headers and in6_addr
2011-04-22 11:04:14 -07:00
rtnetlink: Compute and store minimum ifinfo dump size
2011-06-09 20:38:07 -07:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
ipv4: Fix fib_info->fib_metrics leak
2011-09-16 17:42:26 -04:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER
2011-08-02 04:29:23 -07:00
net: more accurate skb truesize
2011-10-13 16:05:07 -04:00
Merge branch 'master' of github.com:davem330/net
2011-09-22 03:23:13 -04:00
seqlock: Get rid of SEQLOCK_UNLOCKED
2011-05-24 15:22:17 +02:00
net-netlink: Add a new attribute to expose TOS values via netlink
2011-10-12 19:09:18 -04:00
net: Compute protocol sequence numbers and fragment IDs using MD5.
2011-08-06 18:33:19 -07:00
net: add skb frag size accessors
2011-10-19 03:10:46 -04:00
net: Fix files explicitly needing to include module.h
2011-10-31 19:30:28 -04:00
net: Compute protocol sequence numbers and fragment IDs using MD5.
2011-08-06 18:33:19 -07:00
ipv4: Fix 'iph' use before set.
2011-05-12 23:03:46 -04:00
net: add skb frag size accessors
2011-10-19 03:10:46 -04:00
ip_gre: dont increase dev->needed_headroom on a live device
2011-10-20 16:20:30 -04:00
ip: introduce ip_is_fragment helper inline function
2011-06-21 20:33:34 -07:00
ip_options_compile: properly handle unaligned pointer
2011-05-31 15:11:02 -07:00
ipv4: tcp: fix TOS value in ACK messages sent from TIME_WAIT
2011-10-24 03:06:21 -04:00
net: use INET_ECN_MASK instead of hardcoded 3
2011-10-22 00:07:47 -04:00
inet: constify ip headers and in6_addr
2011-04-22 11:04:14 -07:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
rcu: convert uses of rcu_assign_pointer(x, NULL) to RCU_INIT_POINTER
2011-08-02 04:29:23 -07:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
net: ipv4: add IPPROTO_ICMP socket kind
2011-05-13 16:08:13 -04:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
ipv4: avoid useless call of the function check_peer_pmtu
2011-10-24 18:30:07 -04:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
inetpeer: remove unused list
2011-06-08 17:05:30 -07:00
TCP: remove TCP_DEBUG
2011-10-24 17:36:08 -04:00
tcp_cubic: limit delayed_ack ratio to prevent divide error
2011-05-08 15:51:57 -07:00
tcp: add const qualifiers where possible
2011-10-21 05:22:42 -04:00
net: add missing bh_unlock_sock() calls
2011-11-03 18:06:18 -04:00
ipv6: tcp: fix TCLASS value in ACK messages sent from TIME_WAIT
2011-10-27 00:44:35 -04:00
tcp: add const qualifiers where possible
2011-10-21 05:22:42 -04:00
TCP: remove TCP_DEBUG
2011-10-24 17:36:08 -04:00
udp: fix a race in encap_rcv handling
2011-11-02 00:51:27 -04:00
Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux
2011-11-06 19:44:47 -08:00
xfrm4: Don't call icmp_send on local error
2011-07-01 17:33:19 -07:00
ipv4: fix ipsec forward performance regression
2011-10-24 03:01:22 -04:00
net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules
2011-10-31 19:30:30 -04:00
32aaeffbd4