You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Linus Torvalds 6ba74014c1 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6 ... * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1443 commits) phy/marvell: add 88ec048 support igb: Program MDICNFG register prior to PHY init e1000e: correct MAC-PHY interconnect register offset for 82579 hso: Add new product ID can: Add driver for esd CAN-USB/2 device l2tp: fix export of header file for userspace can-raw: Fix skb_orphan_try handling Revert "net: remove zap_completion_queue" net: cleanup inclusion phy/marvell: add 88e1121 interface mode support u32: negative offset fix net: Fix a typo from "dev" to "ndev" igb: Use irq_synchronize per vector when using MSI-X ixgbevf: fix null pointer dereference due to filter being set for VLAN 0 e1000e: Fix irq_synchronize in MSI-X case e1000e: register pm_qos request on hardware activation ip_fragment: fix subtracting PPPOE_SES_HLEN from mtu twice net: Add getsockopt support for TCP thin-streams cxgb4: update driver version cxgb4: add new PCI IDs ... Manually fix up conflicts in: - drivers/net/e1000e/netdev.c: due to pm_qos registration infrastructure changes - drivers/net/phy/marvell.c: conflict between adding 88ec048 support and cleaning up the IDs - drivers/net/wireless/ipw2x00/ipw2100.c: trivial ipw2100_pm_qos_req conflict (registration change vs marking it static)		15 years ago
..
9p	net/9p: Implement TXATTRCREATE 9p call	15 years ago
bluetooth	Bluetooth: Defer SCO setup if mode change is pending	15 years ago
caif	caif-driver: Add CAIF-SPI Protocol driver.	15 years ago
irda	irda: Use __packed annotation instead IRDA_PACKED macro	15 years ago
iucv	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
netfilter	netfilter: nf_nat: make unique_tuple return void	15 years ago
netns	ipv6: ip6mr: support multiple tables	15 years ago
phonet	phonet: use call_rcu for phonet device free	15 years ago
sctp	net: use __packed annotation	15 years ago
tc_act	net sched: fix race in mirred device removal	15 years ago
tipc	tipc: Update commenting in TIPC API	15 years ago
act_api.h	pkt_sched: gen_kill_estimator() rcu fixes	15 years ago
addrconf.h	net: Add checking to rcu_dereference() primitives	15 years ago
af_ieee802154.h	…
af_rxrpc.h	…
af_unix.h	af_unix: Allow credentials to work across user and pid namespaces.	15 years ago
ah.h	net: cleanup include/net	15 years ago
arp.h	net: make neigh_ops constant	16 years ago
atmclip.h	…
ax25.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
ax88796.h	…
cfg80211.h	cfg80211: fix dev <-> wiphy typo	15 years ago
checksum.h	…
cipso_ipv4.h	…
cls_cgroup.h	cls_cgroup: Initialise classid when module is absent	15 years ago
compat.h	net: fix compat_sys_recvmmsg parameter type	15 years ago
datalink.h	…
dcbnl.h	…
dn.h	…
dn_dev.h	net: use __packed annotation	15 years ago
dn_fib.h	decnet: Remove unused FIB metric macros.	15 years ago
dn_neigh.h	…
dn_nsp.h	net: use __packed annotation	15 years ago
dn_route.h	net-next: remove useless union keyword	15 years ago
dsa.h	…
dsfield.h	…
dst.h	net: check for refcount if pop a stacked dst_entry	15 years ago
dst_ops.h	netns: embed ip6_dst_ops directly	16 years ago
esp.h	…
ethoc.h	…
fib_rules.h	net: fib_rules: mark arguments to fib_rules_register const and __net_initdata	15 years ago
flow.h	flow: virtualize flow cache entry methods	15 years ago
garp.h	…
gen_stats.h	net: cleanup include/net	15 years ago
genetlink.h	net: CONFIG_NET_NS reduction	15 years ago
icmp.h	ipv4: raw: move struct raw_sock and raw_sk() to include/net/raw.h	15 years ago
ieee80211_radiotap.h	wireless: update radiotap parser	15 years ago
ieee802154.h	…
ieee802154_netdev.h	ieee802154: add an mlme_ops call to retrieve PHY object	15 years ago
if_inet6.h	ipv6: Replace inet6_ifaddr->dead with state	15 years ago
inet6_connection_sock.h	net: replace ipfragok with skb->local_df	15 years ago
inet6_hashtables.h	tcp: Fix a connect() race with timewait sockets	15 years ago
inet_common.h	inet, inet6: make tcp_sendmsg() and tcp_sendpage() through inet_sendmsg() and inet_sendpage()	15 years ago
inet_connection_sock.h	net: replace ipfragok with skb->local_df	15 years ago
inet_ecn.h	…
inet_frag.h	fragment: add fast path for in-order fragments	15 years ago
inet_hashtables.h	tcp: Fix a connect() race with timewait sockets	15 years ago
inet_sock.h	net - IP_NODEFRAG option for IPv4 socket	15 years ago
inet_timewait_sock.h	net: suppress RCU lockdep false positive in twsk_net()	15 years ago
inetpeer.h	inetpeer: restore small inet_peer structures	15 years ago
ip.h	snmp: 64bit ipstats_mib for all arches	15 years ago
ip6_checksum.h	…
ip6_fib.h	net-next: remove useless union keyword	15 years ago
ip6_route.h	net: sk_dst_cache RCUification	15 years ago
ip6_tunnel.h	net: use __packed annotation	15 years ago
ip_fib.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
ip_vs.h	ipvs: provide default ip_vs_conn_{in,out}_get_proto	15 years ago
ipcomp.h	percpu: add __percpu sparse annotations to net	15 years ago
ipconfig.h	…
ipip.h	net-next: remove useless union keyword	15 years ago
ipv6.h	snmp: 64bit ipstats_mib for all arches	15 years ago
ipx.h	net: use __packed annotation	15 years ago
iw_handler.h	include/net/iw_handler.h: Use SIOCIWFIRST not SIOCSIWCOMMIT in comment	15 years ago
lapb.h	…
lib80211.h	lib80211: remove unused host_build_iv option	15 years ago
llc.h	llc: convert llc_sap_list to RCU	15 years ago
llc_c_ac.h	…
llc_c_ev.h	…
llc_c_st.h	…
llc_conn.h	llc: use a device based hash table to speed up multicast delivery	15 years ago
llc_if.h	…
llc_pdu.h	…
llc_s_ac.h	…
llc_s_ev.h	…
llc_s_st.h	…
llc_sap.h	…
mac80211.h	Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem	15 years ago
mip6.h	net: use __packed annotation	15 years ago
mld.h	ipv6 mcast: Introduce include/net/mld.h for MLD definitions.	15 years ago
ndisc.h	net: use __packed annotation	15 years ago
neighbour.h	net/neighbour.h: fix typo	15 years ago
net_namespace.h	nsproxy: remove INIT_NSPROXY()	15 years ago
netdma.h	…
netevent.h	…
netlabel.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
netlink.h	net: Fix a typo in netlink.h	15 years ago
netrom.h	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	15 years ago
nexthop.h	…
nl802154.h	…
p8022.h	…
pkt_cls.h	net: rename skb->iif to skb->skb_iif	15 years ago
pkt_sched.h	net: Define accessors to manipulate QDISC_STATE_RUNNING	15 years ago
protocol.h	net: drop capability from protocol definitions	15 years ago
psnap.h	…
raw.h	ipv4: ipmr: support multiple tables	15 years ago
rawv6.h	…
red.h	net: cleanup include/net	15 years ago
regulatory.h	wireless: only use alpha2 regulatory information from country IE	15 years ago
request_sock.h	tcp: account SYN-ACK timeouts & retransmissions	15 years ago
rose.h	…
route.h	net-next: remove useless union keyword	15 years ago
rtnetlink.h	rtnetlink: support specifying device flags on device creation	15 years ago
sch_generic.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
scm.h	scm: Capture the full credentials of the scm sender.	15 years ago
slhc_vj.h	…
snmp.h	snmp: 64bit ipstats_mib for all arches	15 years ago
sock.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	15 years ago
stp.h	…
tcp.h	tcp: sizeof struct tcp_skb_cb is 44	15 years ago
tcp_states.h	…
timewait_sock.h	…
transp_v6.h	IPv6: Add dontfrag argument to relevant functions	15 years ago
udp.h	net: cleanups	15 years ago
udplite.h	…
wext.h	wext: refactor	16 years ago
wimax.h	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial	15 years ago
wpan-phy.h	ieee802154: add support for creation/removal of logic interfaces	15 years ago
x25.h	X25: Move accept approve flag to bitfield	15 years ago
x25device.h	X25: Add if_x25.h and x25 to device identifiers	15 years ago
xfrm.h	xfrm: fix XFRMA_MARK extraction in xfrm_mark_get	15 years ago