summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* netfilter: nf_log: Remove NULL checkShivani Bhardwaj2016-06-231-1/+1
* netfilter: make comparision helpers stub functions in ZONES=n caseFlorian Westphal2016-06-231-0/+12
* netfilter: conntrack: align nf_conn on cacheline boundaryFlorian Westphal2016-06-231-1/+1
* netfilter: xt_TRACE: add explicitly nf_logger_find_get callLiping Zhang2016-06-231-6/+19
* netfilter: nf_log: handle NFPROTO_INET properly in nf_logger_[find_get|put]Liping Zhang2016-06-232-20/+21
* netfilter: x_tables: fix possible ZERO_SIZE_PTR pointer dereferencing error.Xiubo Li2016-06-231-0/+3
* netfilter: helper: avoid extra expectation iterations on unregisterFlorian Westphal2016-06-071-29/+32
* bridge: netfilter: checkpatch data type fixesTobin C Harding2016-06-071-20/+20
* Merge branch 'vrf-local'David S. Miller2016-06-061-33/+201
|\
| * net: vrf: ipv6 support for local traffic to local addressesDavid Ahern2016-06-061-4/+85
| * net: vrf: ipv4 support for local traffic to local addressesDavid Ahern2016-06-061-2/+98
| * net: vrf: Minor refactoring for local address patchesDavid Ahern2016-06-061-27/+18
|/
* Merge branch 'hv_netvsc-cleanups'David S. Miller2016-06-054-52/+38
|\
| * hv_netvsc: pass struct net_device to rndis_filter_set_offload_params()Vitaly Kuznetsov2016-06-051-3/+2
| * hv_netvsc: pass struct net_device to rndis_filter_set_device_mac()Vitaly Kuznetsov2016-06-053-6/+3
| * hv_netvsc: pass struct netvsc_device to rndis_filter_{open, close}()Vitaly Kuznetsov2016-06-053-19/+13
| * hv_netvsc: introduce {net, hv}_device_to_netvsc_device() helpersVitaly Kuznetsov2016-06-053-25/+22
| * hv_netvsc: remove redundant assignment in netvsc_recv_callback()Vitaly Kuznetsov2016-06-051-1/+0
|/
* net: disable fragment reassembly if high_thresh is zeroMichal Kubeček2016-06-051-1/+1
* Merge branch 'hns-acpi'David S. Miller2016-06-0418-262/+706
|\
| * net: hns: net: hns: enet adds support of acpiKejian Yan2016-06-041-12/+44
| * net: hns: implement the miscellaneous operation by aslKejian Yan2016-06-041-0/+167
| * net: hns: register phy device in each mac initial sequenceKejian Yan2016-06-041-7/+126
| * net: hns: dsaf adds support of acpiKejian Yan2016-06-043-83/+114
| * net: hns: add dsaf misc operation methodKejian Yan2016-06-0410-70/+111
| * net: hns: add uniform interface for phy connectionKejian Yan2016-06-048-25/+49
| * net: hns: enet specify a reference to dsaf by fwnode_handleKejian Yan2016-06-044-14/+16
| * net: hns: use platform_get_irq instead of irq_of_parse_and_mapKejian Yan2016-06-041-3/+2
| * net: hns: use device_* APIs instead of of_* APIsKejian Yan2016-06-042-12/+8
| * net: hisilicon: add support of acpi for hns-mdioKejian Yan2016-06-041-37/+69
| * net: hisilicon: cleanup to prepare for other casesKejian Yan2016-06-041-30/+18
| * ACPI: bus: add stub acpi_evaluate_dsm() to linux/acpi.hKejian Yan2016-06-041-0/+8
| * ACPI: bus: add stub acpi_dev_found() to linux/acpi.hKejian Yan2016-06-041-0/+5
|/
* Merge branch 'dsa-new-binding'David S. Miller2016-06-0415-410/+1489
|\
| * net: dsa: Document new bindingAndrew Lunn2016-06-041-2/+276
| * arm: dt: vf610-zii-devel-b: Make use of new DSA bindingAndrew Lunn2016-06-041-158/+170
| * net: dsa: Add new binding implementationAndrew Lunn2016-06-047-4/+694
| * net: dsa: mv88e6xxx: Refactor MDIO so driver registers mdio busAndrew Lunn2016-06-042-9/+86
| * net: dsa: mv88e6xxx: Rename _phy_ to _mdio_Andrew Lunn2016-06-041-63/+63
| * net: dsa: Make mdio bus optionalAndrew Lunn2016-06-041-11/+13
| * net: dsa: Refactor selection of tag ops into a functionAndrew Lunn2016-06-044-61/+54
| * net: dsa: mv88e6xxx: Only support EDSA taggingAndrew Lunn2016-06-041-6/+2
| * net: dsa: Split up creating/destroying of DSA and CPU portsAndrew Lunn2016-06-042-35/+54
| * net: dsa: Copy the routing table into the switch structureAndrew Lunn2016-06-043-3/+12
| * net: dsa: Remove dynamic allocate of routing tableAndrew Lunn2016-06-043-19/+5
| * net: dsa: Move port device node into port structureAndrew Lunn2016-06-043-7/+7
| * net: dsa: Add a ports structure and use it in the switch structureAndrew Lunn2016-06-049-29/+38
| * net: dsa: tag_{e}dsa.c: Remove dependency on platform dataAndrew Lunn2016-06-042-2/+10
| * net: dsa: slave: Remove MDIO address from switch MDIO bus nameAndrew Lunn2016-06-041-2/+1
| * net: dsa: mv88e6xxx: fix circular lock in PPU workVivien Didelot2016-06-041-4/+9