* commit 'd9286869e5de1c3c827885390c9525e7e5bf9629':
  UGW_SW-21409-Remove-printks-and-update-export-functions

Merge pull request #242 in SW_PON/linux from UGW_SW-20774-9710-11-12-multicast-porting-to-linux4.9 to xrx500

UGW_SW-20774-9710-11-12-multicast-porting-to-linux4.9

* commit 'a62ee6fdd766c0f68403b92a834da8c3ce583b45':
  UGW_SW-20774: Changes requred to Build Multicast without ACL Support

Merge pull request #248 in SW_PON/linux from bugfix/UGW_SW-21667-getting-json-error-during-automation-run-in-prt-pta to xrx500

* commit 'c774259112f0845d6917fdf0c69f723665fc45ca':
  UGW_SW-21667: avoid piggybacked FIN for TSO packets

Merge pull request #217 in SW_PON/linux from feature/DRVLIB_SW-532-crypto-acceleration-driver-support to xrx500

* commit 'edfbe6685e9187fd437fd60ea12118bcc0026a5b':
  JIRA: DRVLIB_SW-532 - Linux 4.9 EIP97 driver support for GRX500

Merge pull request #238 in SW_PON/linux from bugfix/DRVLIB_SW-395-gswip3.1_driver_development to xrx500

* commit '98d138a640c1875ab91cf77a6d5e7bf82cbea8de':
  Pmac Ingress SubId configuration issue Fix

Merge pull request #234 in SW_PON/linux from DRVLIB_SW-559-datapath-hw-capability-api-support to xrx500

* commit '8e05571678045e0a23b0aba4a598c0d2ba5c769a':
  Jira DRVLIB_SW-559: fix multiple dev_put issue in the proc
  Jira DRVLIB_SW-559: fix some memory leakage issue
  Jira DRVLIB_SW-559: implement datapath HW capability as requested

Merge pull request #244 in SW_PON/linux from bugfix/UGW_SW-22228-grx550-lro-session-addition-not-happening-if-litepath-is-disabled to xrx500

UGW_SW-22228-grx550-lro-session-addition-not-happening-if-litepath-is-disabled

* commit '204f0de722e33538cdb40753dc4f413060e20215':
  UGW_SW-22228: re-compute ip header checksum in LRO, otherwise ip_rcv drops it

Merge pull request #245 in SW_PON/linux from bugfix/UGW_SW-22236-ppa-flag-not-set-in-datapath-library-and-skb-dw-fields-are-not-copied to xrx500

* commit 'd2e153b317e65cdd664802d845f8dc7015d3d713':
  UGW_SW-22236: set ppa flag and move skb DWs inside headers_start

* commit '97ef2f49c319ffcff52d24f0915e908d04ccd5fb':
  UGW_SW-20511-reverting-the-review-changes-as-wlan-not-working

Merge pull request #239 in SW_PON/linux from UGW_SW-20774-9710-11-12-multicast-porting-to-linux4.9 to xrx500

UGW_SW-20774-9710-11-12-multicast-porting-to-linux4.9

* commit 'fecf5cfbecff7d9e0b3ccc18cf116f9c68c656d0':
  UGW_SW-20774 : Multicast fix for the FTP crash

* commit 'a501e2536b36f0f566ed312fe1a3fa17fd48e55f':
  UGW_SW-20511-addressing-review-comments-UGW_SW-21375-UGW_SW-21409

Merge pull request #233 in SW_PON/linux from bugfix/UGW_SW-21686-the-hw-checksum-offload-is-disabled-for-gx550 to xrx500

* commit '89ee28893562b5220cd2613fa85be10afb24c0f3':
  UGW_SW-21686: HW checksum enable for grx550 when TOE disable

* commit '57394d6be142d467537f03edf111a829b9c279a9':
  UGW_SW-20511-addressing-review-comments-applying-missed-patch
  UGW_SW-20511-addressing-review-comments-update-kernel-patches
  UGW_SW-20511-ugw-8.x-update-wlan-dfs-kernel-patch
  UGW_SW-20511-ugw-8.x-update_wlan_driver_05.04.01.00.14_kernel_patches

Merge pull request #227 in SW_PON/linux from bugfix/UGW_SW-20393-pp-subsystem-integration-problems-with-ugw8.x to xrx500

* commit '15e8e69c20afe76bd8085ecd949b099b1befc051':
  UGW_SW-20393: add new fields to the end of the atm_trafprm structure
  UGW_SW-20393: fix identation, ATM_DELBACKENDIF, remove unused CONFIG
  UGW_SW-20393: modify ATM_DELBACKENDIF to avoid conflict
  UGW_SW-20393: remove unused CONFIG_LTQ_ATM
  UGW_SW-20393: modify ATM_DELBACKENDIF
  UGW_SW-20393: remove DEBUG in aca.c
  UGW_SW-20393: ATM and 518 EP

UGW_SW-21120-9609-net_macvlan_bridge_support

* commit 'f6c03585f5429091c91b3531f17a285476eb2e27':
  UGW_SW-21120: Net_Macvlan Bridge Support

Merge pull request #231 in SW_PON/linux from feature/UGW_SW-20796-lcp-packet-prioritization-patch-for-qos to xrx500

* commit '3169edd1475d2062772596eb307f13f01257b426':
  UGW_SW-20796: Set skb-priority of LCP control packets to highest priority

* commit 'a89888fd4ea5f44187ef36e330813464495c2698':
  Integrating QoS 16TC and VAP feature changes in 8.x

Merge pull request #230 in SW_PON/linux from bugfix/UGW_SW-21419-ugw-8.x-redirect-the-packets-to-core1-cpu2 to xrx500

* commit 'be6cebf481b67c45318e096cc0a22ece39731622':
  UGW_SW-21419: redirecting the packets to CPU2

Merge pull request #214 in SW_PON/linux from feature/UGW_SW-20794-extmark-to-prio-conversion-for-qos to xrx500

* commit '369b606d3183ee96a62001f8a7aa62620cd70d8a':
  UGW_SW-20794: Extracting skb->priority from extension mark

Merge pull request #208 in SW_PON/linux from feature/UGW_SW-20793-extension-mark-patch-in-8.x to xrx500

Enable extension mark support

* commit '247560d5df8215e471c464e1c61c5f94530c7402':
  UGW_SW-20793: Add extmark extension support for QoS

Merge pull request #220 in SW_PON/linux from bugfix/UGW_SW-21311-ugw-8.x-umt-sw-mode-compilation-error-seen-in-cbm-driver to xrx500

ugw-8.x-umt-sw-mode-compilation-error-seen-in-cbm-driver - Merging as PON build passed

* commit '197f2257e9f97f168f14019d43091c8222714605':
  Fix warning
  Fix compilation error and warning

Merge pull request #223 in SW_PON/linux from bugfix/DRVLIB_SW-534-fix-litepath-default-descript-setting to xrx500

DRVLIB_SW-534-fix-litepath-default-descript-setting  -  Merging as PON build passed

* commit 'ebfba330cc13d26cedd8ff308a2ee1f5b467f507':
  fix litephat default wrong dma descriptor setting

* commit '088ee5f633358f0a2b3e66a010b79f6b02c7f181':
  UGW_SW-13835-merging fix for local out session not having proper flags
  UGW_SW-13835-merging fix for TCP litepath not working from ppa

Merge pull request #218 in SW_PON/linux from bugfix/UGW_SW-21272-8.x-wlan-directpath-port-allocation-failed to xrx500

UGW_SW-21272-8.x-wlan-directpath-port-allocation-failed to xrx500

* commit '0b172560d6e3db5df09314212c87b41d8cdfcf79':
  No dequeue port for tunneling
  remove comment
  Fix dp port alloc failure for Directpath and Tunneling port

Merge pull request #212 in SW_PON/linux from feature/DRVLIB_SW-536-pinctrl-driver-support-pinmux-array to xrx500

* commit '8107ce5f08e8ef1691b82658c6940118f4bedd0a':
  DRVLIB_SW-536 support pinctrl pinmux array

Merge pull request #219 in SW_PON/linux from UGW_SW-20774-9710-11-12-multicast-porting-to-linux4.9 to xrx500

* commit '92832d3bea30cc2b34a2cd841caef0ef20d02990':
  UG_SW-20774: Removing Mcast changes for Automation to Pass

Merge pull request #182 in SW_PON/linux from feature/DRVLIB_SW-530-on-die-ecc-nand-flash-support to xrx500

On-die ECC free NAND support for kernel 4.9

* commit '2e4588b71763df0c34a4e580e26fe339b053e6aa':
  JIRA DRVLIB_SW-530 - On-die-ECC NAND flash support added

Approved by Ingo, Thomas, Zahari and Alexander

* commit '824413fae83602278873146f0203527716d578ef':
  FALCONSW-164: pon_eth: avoid using the ltq_eth_drv_xrx500.h header file
  FALCONSW-164: pon_eth: get port_id from device tree reg address
  FALCONSW-164: pon-eth: Set T-Cont index to datapath library
  FALCONSW-164: pon_eth: Get deq_port_base from datapath library
  FALCONSW-164: pon_eth: use the *_ext() functions from datapath library
  FALCONSW-164: dp: export dp_register_dev_ext()

Merge pull request #215 in SW_PON/linux from bugfix/DRVLIB_SW-534-datapath-need-export-mib-pmac-api-2 to xrx500

* commit 'e6f6154336bbd9ba9c5d845aa15322ed6e2a1b01':
  export dp_get_netif_stats dp_clear_netif_stats dp_pmac_set

* commit '5cd3e28c87bf3f66a20bbeb5f34f6bd38d4248f1':
  DRVLIB_SW-547: adjust the sequence of print memory map
  MIPS: Use early_init_fdt_reserve_self to protect DTB location
  MIPS: init: Ensure bootmem does not corrupt reserved memory
  MIPS: init: Ensure reserved memory regions are not added to bootmem

Merge pull request #207 in SW_PON/linux from bugfix/DRVLIB_SW-519-cbm-alloc-dealloc-for-interface to xrx500

* commit '84fa0904f87216d19f855c950184a2e64bf3a86e':
  correct checkpatch errors
  fix for dma/pon port alloc/dealloc

Merge pull request #199 in SW_PON/linux from feature/FALCONSW-387-extend-pon-ethernet-driver-for to xrx500

Approved by Alexander, Shailesh, Ingo and Thomas

* commit 'b8f03fa7b5f5eb15a810ebe7c5391d9476779390':
  FALCONSW-387: pon_eth: Fix interface statistics
  FALCONSW-387: pon_eth: fix deregistration of dp dev
  FALCONSW-387: pon_eth: Add GEM port as slave to T-Cont
  FALCONSW-387: pon_eth: Allow to provide an Alloc Index for the T-Cont interface.
  FALCONSW-387: pon_eth: Use Index from GEM interface to configure datapath
  FALCONSW-387: pon_eth: Remove old GEM and PCP configuration interface
  FALCONSW-387: pon_eth: Add GEM port network interface
  FALCONSW-387: pon_eth: Add T-Cont network interface
  FALCONSW-387: pon_eth: add bp prefix to bride port functions
  FALCONSW-387: pon_eth: rename from ltq_pon_eth.c to pon_eth.c

* commit '172e39526ea2a21f930019238741ddc658e97a82':
  UGW_SW-20744 : Mcast fixes for CI Assistance build failure
  UGW_SW-20774: Multicast Fixes for SW_PON Compilation
  UGW_SW-20744 : Porting Multicast Helper to Linux 4.9 fixes related to comments
  UGW_SW-20744 : Porting Multicast Helper Snooping and Latency to Linux4.9 cleaned
  UGW_SW-20774 : Porting Multicast Helper Snooping and Latency Patches to linux 4.9

* commit 'd181263ed67568bd6aca125a280dc084a5bcd899':
  UGW_SW-20802-enabling-ifx_voip_common-in
  UGW_SW-20802-enabling-ifx_voip_common-in
  UGW_SW-20802-enabling-ifx_voip_common-in
  UGW_SW-20802-enabling-ifx_voip_common-in
  UGW_SW:20802-enabling-ifx_voip_common-in

Merge pull request #187 in SW_PON/linux from feature/DRVLIB_SW-520-enhancement-to-disable-mac to xrx500

* commit '45e78b18fcf2a25f3d2573ffd1618902fc91c5da':
  Review comments and checkpatch fix
  Avoid packet duplication/forwarding from linux & CPU path MAC config enhancement
  Avoid packet duplication/forwarding from linux during switch h/w offload
  Avoid packet duplication/forwarding from linux during switch h/w offload
  CPU path MAC handling workaround when device added to bridge
  DRVLIB_SW-520 checkpatch fix
  DRVLIB_SW-520 disable/enable MAC learning for CPU path & swdev path

Merge pull request #188 in SW_PON/linux from feature/UGW_SW-19893-8.x-add-support-for-port-trigger to xrx500

* commit '8823718a757b8569686d77c543b71afde03a186a':
  UGW_SW-19893:8.x Port Trigger Added GPL in the header.
  UGW_SW-19893:8.x Port Trigger Added GPL.
  Port trigger support: addressed review comment.
  Port trigger support

Merge pull request #206 in SW_PON/linux from bugfix/DRVLIB_SW-544-grx500-soc-can-not-support to xrx500

* commit 'cb81731bb6b35ba39a6a82eb1a2c0b638b8293d1':
  fix simple-mfd bus device emulation issue

Merge pull request #189 in SW_PON/linux from feature/DRVLIB_SW-517-Develop-proc-filesystem-for-CQM to xrx500

* commit '1a7a92460146c524af9ef65b13d01956bf97ff03':
  Fix bugs, warnings, code cleanup, fix checkpatch errors and warnings
  Create debugfs file system to dump the register values of CQEM, CQEM ENQ, CQEM DEQ, CQEM_DESC64B. It should take the port number as input and print the relevant register values.Also help command is to be developed for each of the proc entries.

Merge pull request #197 in SW_PON/linux from feature/UGW_SW-20637-toe-driver-porting-to-4.9-kernel to xrx500

* commit '99713e8a7a8fec1752911a907eca6e5e9fb9fc3a':
  UGW_SW-20637:clean up the TOE driver
  UGW_SW-20637:TOE driver support
  UGW_SW-20637:TOE driver support

Merge pull request #201 in SW_PON/linux from feature/UGW_SW-20487-porting-dc_dp-to-4.9-kernel to xrx500

sourcing directconnect_dp/Kconfig

* commit '548623e99d69498dad2e18d8dd6ed6ebcd849d02':
  UGW_SW-20487: enabling the sourcing of directconnect_dp Kconfig