# \[PATCH 0/2\] net: fix net-next

- From: Alex Elder \<hidden\>
- Date: 2020-03-12 16:44:36 
- List: netdev
- Page: https://ratatoskr.run/netdev/2020/03/5893436
- Thread: https://ratatoskr.run/netdev/2020/03/5893436/t.md

```text
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.

					-Alex

Alex Elder (2):
  bitfield.h: add FIELD_MAX() and field_max()
  Revert "arm64: dts: sdm845: add IPA information"

 arch/arm64/boot/dts/qcom/sdm845.dtsi | 51 ----------------------------
 include/linux/bitfield.h             | 14 ++++++++
 2 files changed, 14 insertions(+), 51 deletions(-)

-- 
2.20.1

```