summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'testing' of github.com:ceph/ceph-client into v3.8-rc5-testingAlex Elder2013-01-303-161/+103
|\
| * libceph: fix undefined behavior when using snprintf()Cong Ding2013-01-251-18/+10
| * libceph: pass num_op with opsAlex Elder2013-01-171-28/+15
| * libceph: don't set pages or bio in ceph_osdc_alloc_request()Alex Elder2013-01-171-13/+2
| * libceph: don't set flags in ceph_osdc_alloc_request()Alex Elder2013-01-171-7/+4
| * libceph: drop osdc from ceph_calc_raw_layout()Alex Elder2013-01-171-6/+4
| * libceph: drop snapid in ceph_calc_raw_layout()Alex Elder2013-01-171-10/+4
| * libceph: pass length to ceph_calc_file_object_mapping()Alex Elder2013-01-172-7/+8
| * libceph: pass length to ceph_osdc_build_request()Alex Elder2013-01-171-3/+3
| * libceph: kill op_needs_trail()Alex Elder2013-01-171-23/+4
| * libceph: always allow trail in osd requestAlex Elder2013-01-171-31/+12
| * rbd: drop oid parameters from ceph_osdc_build_request()Alex Elder2013-01-171-8/+5
| * libceph: reformat __reset_osd()Alex Elder2013-01-171-14/+18
| * crush: avoid recursion if we have already collidedSage Weil2013-01-171-1/+1
| * libceph: for chooseleaf rules, retry CRUSH map descent from root if leaf is f...Jim Schutt2013-01-172-3/+16
| * ceph: re-calculate truncate_size for strip objectYan, Zheng2013-01-171-0/+8
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-01-1417-115/+237
|\ \
| * | net, wireless: overwrite default_ethtool_opsStanislaw Gruszka2013-01-112-2/+9
| * | tcp: accept RST without ACK flagEric Dumazet2013-01-101-2/+2
| * | ipv6: use addrconf_get_prefix_route for prefix route lookup [v2]Romain Kuntz2013-01-101-14/+11
| * | ipv6: fix the noflags test in addrconf_get_prefix_routeRomain Kuntz2013-01-101-1/+1
| * | tcp: fix splice() and tcp collapsing interactionEric Dumazet2013-01-101-3/+10
| * | tcp: splice: fix an infinite loop in tcp_read_sock()Eric Dumazet2013-01-101-1/+1
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2013-01-0911-91/+202
| |\ \
| | * | mac80211: fix maximum MTUChaitanya2013-01-031-10/+1
| | * | mac80211: fix dtim_period in hidden SSID AP associationJohannes Berg2013-01-033-37/+55
| | * | mac80211: use del_timer_sync for final sta cleanup timer deletionJohannes Berg2013-01-031-1/+1
| | * | mac80211: fix station destruction in AP/mesh modesJohannes Berg2013-01-034-17/+62
| | * | mac80211: RMC buckets are just list headsThomas Pedersen2013-01-032-5/+5
| | * | mac80211: assign VLAN channel contextsJohannes Berg2013-01-033-3/+45
| | * | mac80211: flush AP_VLAN stations when tearing down the BSS APFelix Fietkau2013-01-031-0/+2
| | * | mac80211: fix ibss scanningStanislaw Gruszka2013-01-033-18/+31
| * | | net: prevent setting ttl=0 via IP_TTLCong Wang2013-01-081-1/+1
* | | | Merge tag 'nfs-for-3.8-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfsLinus Torvalds2013-01-112-4/+11
|\ \ \ \
| * | | | SUNRPC: Ensure we release the socket write lock if the rpc_task exits earlyTrond Myklebust2013-01-082-4/+11
* | | | | nfs: fix sunrpc/clnt.c kernel-doc warningsRandy Dunlap2013-01-101-1/+1
* | | | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s39...Linus Torvalds2013-01-101-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | s390/irq: remove split irq fields from /proc/statHeiko Carstens2013-01-081-1/+1
| |/ / /
* | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2013-01-0820-68/+221
|\ \ \ \ | |/ / / |/| | |
| * | | Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2013-01-073-31/+28
| |\ \ \
| | * | | netfilter: xt_recent: avoid high order page allocationsEric Dumazet2013-01-041-5/+18
| | * | | netfilter: fix missing dependencies for the NOTRACK targetPablo Neira Ayuso2013-01-041-0/+3
| | * | | netfilter: ip6t_NPT: fix IPv6 NTP checksum calculationUlrich Weber2013-01-041-26/+7
| * | | | ipv4: fix NULL checking in devinet_ioctl()Xi Wang2013-01-061-1/+1
| * | | | net/ipv4/ipconfig: really display the BOOTP/DHCP server's address.Philippe De Muyter2013-01-041-2/+6
| * | | | mac802154: fix NOHZ local_softirq_pending 08 warningAlexander Aring2013-01-041-1/+1
| |/ / /
| * | | bridge: add empty br_mdb_init() and br_mdb_uninit() definitions.Rami Rosen2013-01-031-0/+6
| * | | bridge: Correctly unregister MDB rtnetlink handlersVlad Yasevich2013-01-032-3/+12
| * | | Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2012-12-2813-30/+167
| |\ \ \
| | * | | netfilter: ctnetlink: fix leak in error path of ctnetlink_create_expectJesper Juhl2012-12-261-1/+1