summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledfo...Linus Torvalds2015-06-2314-266/+102
|\
| * IB/core: Change ib_create_cq to use struct ib_cq_init_attrMatan Barak2015-06-125-13/+23
| * Merge branch 'for-4.2-misc' into k.o/for-4.2Doug Ledford2015-06-023-13/+24
| |\
| | * rds: re-entry of rds_ib_xmit/rds_iw_xmitWengang Wang2015-06-023-13/+24
| | |
| | \
| *-. \ Merge branches 'bart-srp', 'generic-errors', 'ira-cleanups' and 'mwang-v8' in...Doug Ledford2015-05-2011-240/+55
| |\ \ \ | | |_|/ | |/| |
| | | * IB/core: Change rdma_protocol_iboe to roceIra Weiny2015-05-201-1/+1
| | | * IB/Verbs: Use management helper rdma_cap_read_multi_sge()Michael Wang2015-05-181-2/+2
| | | * IB/Verbs: Reform IB-ulp xprtrdmaMichael Wang2015-05-182-29/+20
| | |/ | |/|
| | * RDS: Switch to generic logging helpersSagi Grimberg2015-05-187-113/+10
| | * xprtrdma, svcrdma: Switch to generic logging helpersSagi Grimberg2015-05-183-98/+25
| |/
* | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jik...Linus Torvalds2015-06-231-1/+1
|\ \
| * | netfilter: ebtables: fix comment grammarGeert Uytterhoeven2015-05-261-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6Linus Torvalds2015-06-229-239/+356
|\ \ \
| * \ \ Merge branch 'mvebu/drivers' of git://git.kernel.org/pub/scm/linux/kernel/git...Herbert Xu2015-06-1944-831/+1458
| |\ \ \
| * | | | xfrm: Define ChaCha20-Poly1305 AEAD XFRM algo for IPsec usersMartin Willi2015-06-041-0/+12
| * | | | mac80211: Switch to new AEAD interfaceHerbert Xu2015-05-283-39/+33
| * | | | mac802154: Switch to new AEAD interfaceHerbert Xu2015-05-281-27/+14
| * | | | esp6: Switch to new AEAD interfaceHerbert Xu2015-05-281-78/+122
| * | | | esp4: Switch to new AEAD interfaceHerbert Xu2015-05-281-78/+122
| * | | | ipsec: Add IV generator information to xfrm_stateHerbert Xu2015-05-282-9/+32
| * | | | xfrm: Add IV generator information to xfrm_algo_descHerbert Xu2015-05-281-0/+16
| * | | | mac802154: Include crypto/aead.hHerbert Xu2015-04-231-1/+2
| * | | | mac80211: Include crypto/aead.hHerbert Xu2015-04-233-5/+3
* | | | | Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/ke...Linus Torvalds2015-06-222-6/+1
|\ \ \ \ \
| * \ \ \ \ Merge branch 'linus' into timers/coreThomas Gleixner2015-05-1989-1052/+2259
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| * | | | | net: core: pktgen: Remove bogus hrtimer_active() checkThomas Gleixner2015-04-221-2/+0
| * | | | | net: sched: Use hrtimer_resolution instead of hrtimer_get_res()Thomas Gleixner2015-04-221-4/+1
* | | | | | sctp: allow authenticating DATA chunks that are bundled with COOKIE_ECHOMarcelo Ricardo Leitner2015-06-121-1/+10
* | | | | | net: don't wait for order-3 page allocationShaohua Li2015-06-112-2/+2
* | | | | | mpls: handle device renames for per-device sysctlsRobert Shearman2015-06-111-0/+11
* | | | | | net, swap: Remove a warning and clarify why sk_mem_reclaim is required when d...Mel Gorman2015-06-101-8/+5
* | | | | | bridge: fix multicast router rlist endless loopNikolay Aleksandrov2015-06-101-4/+3
* | | | | | tipc: disconnect socket directly after probe failureErik Hugne2015-06-101-5/+11
* | | | | | Revert "ipv6: Fix protocol resubmission"David S. Miller2015-06-101-5/+3
* | | | | | cfg80211: wext: clear sinfo struct before calling driverJohannes Berg2015-06-091-0/+2
* | | | | | net: replace last open coded skb_orphan_frags with function callWillem de Bruijn2015-06-081-9/+2
* | | | | | ipv6: Fix protocol resubmissionJosh Hunt2015-06-081-3/+5
* | | | | | ipv6: fix possible use after free of dev statsRobert Shearman2015-06-081-2/+9
* | | | | | bridge: disable softirqs around br_fdb_update to avoid lockupNikolay Aleksandrov2015-06-071-0/+2
* | | | | | Revert "bridge: use _bh spinlock variant for br_fdb_update to avoid lockup"David S. Miller2015-06-071-2/+2
* | | | | | mpls: fix possible use after free of deviceRobert Shearman2015-06-072-1/+2
* | | | | | bridge: use _bh spinlock variant for br_fdb_update to avoid lockupWilson Kok2015-06-071-2/+2
* | | | | | ipv4/udp: Verify multicast group is ours in upd_v4_early_demux()Shawn Bohrer2015-06-041-3/+15
* | | | | | openvswitch: disable LROJiri Benc2015-06-031-0/+1
* | | | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nfDavid S. Miller2015-06-011-4/+0
|\ \ \ \ \ \
| * | | | | | Revert "netfilter: ensure number of counters is >0 in do_replace()"Bernhard Thaler2015-06-011-4/+0
* | | | | | | vti6: Add pmtu handling to vti6_xmit.Steffen Klassert2015-06-011-0/+14
* | | | | | | Revert "net: core: 'ethtool' issue with querying phy settings"David S. Miller2015-06-011-9/+1
* | | | | | | net: dsa: Properly propagate errors from dsa_switch_setup_oneFlorian Fainelli2015-05-311-2/+2
* | | | | | | tcp: fix child sockets to use system default congestion control if not setNeal Cardwell2015-05-312-2/+8