From: David S. Miller Date: Wed, 8 Nov 2017 04:53:34 +0000 (+0900) Subject: Merge branch 'fsl-fman-next' X-Git-Tag: v4.19~2168^2~102 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=403466feb1ac978a734518f7cee3cd9e63cb773c;p=platform%2Fkernel%2Flinux-rpi.git Merge branch 'fsl-fman-next' Christophe JAILLET says: ==================== fsl/fman: Fix some error handling code in mac_probe Commit c6e26ea8c893 ("dpaa_eth: change device used") generated some conflicts in my patches waiting for submission. So I took a closer look at it. So here is a serie of 4 patches. The 1st one is just about a spurious call to 'dev_set_drvdata()', which is done in only 1 error handling path in the function. The 2nd one removes some devm_iounmap/release/kfree functions which look useless to me. The 3rd one fixes a missing of_node_put. The 4th one is just cosmetic and removes a useless message. ==================== Signed-off-by: David S. Miller --- 403466feb1ac978a734518f7cee3cd9e63cb773c