From: David S. Miller Date: Thu, 12 Mar 2020 22:48:37 +0000 (-0700) Subject: Merge branch 'ipa-fixes' X-Git-Tag: v5.15~4200^2~180 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0f70eedc0f770af21571eff340bf388a1b4f3744;p=platform%2Fkernel%2Flinux-starfive.git Merge branch 'ipa-fixes' Alex Elder says: ==================== net: fix net-next David: These patches resolve two issues caused by the IPA driver being incorporated into net-next. I hope you will merge them as soon as you can. The IPA driver was merged into net-next last week, but two problems arise as a result, affecting net-next and linux-next: - The patch that defines field_max() was not incorporated into net-next, but is required by the IPA code - A patch that updates "sdm845.dtsi" *was* incorporated into net-next, but other changes to that file in the Qualcomm for-next branch lead to errors Bjorn has agreed to incorporate the DTS file change into the Qualcomm tree after it is reverted from net-next. ==================== Signed-off-by: David S. Miller --- 0f70eedc0f770af21571eff340bf388a1b4f3744