From: David S. Miller Date: Tue, 14 Mar 2017 04:51:51 +0000 (-0700) Subject: Merge branch 'bcmgenet-add-support-for-GENETv5' X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=62a9fa01add88082b32096211e0a88016e996713;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Merge branch 'bcmgenet-add-support-for-GENETv5' Doug Berger says: ==================== net: bcmgenet: add support for GENETv5 This collection of patches contains changes related to adding support for the BCM7260, BCM7268, and BCM7271 devices that contain a new version of the GENET MAC IP block (v5) and a new fast ethernet (10/100BASE-T) internal PHY. These patches were originally developed on top of the bug fixes of the "[PATCH v2 net 0/8] net: bcmgenet: minor bug fixes" patch set previously accepted into the net repository, but this submission is designed to be applied to the current net-next that does not yet include them. As a result there will be some merge conflicts that I would be happy to help resolve if desired. Specifically, conflicts should occur with these patches from the minor bug fixes set: [PATCH v2 net 3/8] net: bcmgenet: reserved phy revisions must be checked first [PATCH v2 net 5/8] net: bcmgenet: synchronize irq0 status between the isr and task [PATCH v2 net 8/8] net: bcmgenet: decouple flow control from bcmgenet_tx_reclaim ==================== Signed-off-by: David S. Miller --- 62a9fa01add88082b32096211e0a88016e996713