tree 9b0251d090f8ba3f365a3069a1490c5a1f8c0a7c
parent 82a9822b26770b3965790f6a2340f0341a9bc102
parent 4639b38b720913ef01e4ea1b20d7615af2d45d70
author David S. Miller <davem@davemloft.net> 1584053317 -0700
committer David S. Miller <davem@davemloft.net> 1584053317 -0700

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 <davem@davemloft.net>