APPLIED: [PULL][Trusty/Utopic] xgene-enet 10G & SGMII 1G support

[Dann Frazier]

Two of the changesets in my branch appear to be missing from the trusty merge:

commit d13574e8c45453bb10e6d808c4c42a42ee2fe4b6
Author: Florian Fainelli <f.fainelli at gmail.com>
Date:   Fri Nov 15 06:23:32 2013 +0000

    of: make of_get_phy_mode parse 'phy-connection-type'

    BugLink: http://bugs.launchpad.net/bugs/1381084

    Per the ePAPR v1.1 specification, 'phy-connection-type' is the canonical
    property name for describing an Ethernet to PHY connection type. Make
    sure that of_get_phy_mode() also attempts to parse that property and
    update the comments mentioning 'phy-mode' to also include
    'phy-connection-type'.

    Signed-off-by: Florian Fainelli <f.fainelli at gmail.com>
    Signed-off-by: Grant Likely <grant.likely at linaro.org>
    (cherry picked from cf4c9eb5a451ba26246477dd3168e98b7a5c1b1c upstream)
    Signed-off-by: dann frazier <dann.frazier at canonical.com>

commit f84148cf4ce2cc9a1f37d1a2f6d17801f4c10e90
Author: Andy Fleming <afleming at gmail.com>
Date:   Fri Jan 10 14:26:46 2014 +0800

    phylib: introduce PHY_INTERFACE_MODE_XGMII for 10G PHY

    BugLink: http://bugs.launchpad.net/bugs/1381084

    Signed-off-by: Andy Fleming <afleming at gmail.com>
    Signed-off-by: Shaohui Xie <Shaohui.Xie at freescale.com>
    Acked-by: Florian Fainelli <f.fainelli at gmail.com>
    Signed-off-by: David S. Miller <davem at davemloft.net>
    (cherry picked from 898dd0bda366edd0b077db4389a26c00509c73c9 upstream)
    [dannf: dropped enum hunk, which was already applied by a4bc2e54]
    Signed-off-by: dann frazier <dann.frazier at canonical.com>

On Tue, Nov 18, 2014 at 10:12 AM, Tim Gardner <tim.gardner at canonical.com> wrote:
>
> --
> Tim Gardner tim.gardner at canonical.com