From: David S. Miller Date: Tue, 20 Dec 2016 19:12:30 +0000 (-0500) Subject: Merge branch 'hix5hd2_gmac-compatible-string' X-Git-Tag: v4.14-rc1~1807^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92f95322c65fef330cc0a6bb6ed3e7966f8635d5;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'hix5hd2_gmac-compatible-string' Dongpo Li says: ==================== net: hix5hd2_gmac: keep the compatible string not changed This patch series fix the patch: d0fb6ba75dc0 ("net: hix5hd2_gmac: add generic compatible string") The SoC hix5hd2 compatible string has the suffix "-gmac" and we should not change its compatible string. So we should name all the compatible string with the suffix "-gmac". Creating a new name suffix "-gemac" is unnecessary. ==================== Signed-off-by: David S. Miller --- 92f95322c65fef330cc0a6bb6ed3e7966f8635d5