mbox series

[0/2] net: fix net-next

Message ID 20200312164428.18132-1-elder@linaro.org (mailing list archive)
Headers show
Series net: fix net-next | expand

Message

Alex Elder March 12, 2020, 4:44 p.m. UTC
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(-)

Comments

David Miller March 12, 2020, 10:48 p.m. UTC | #1
From: Alex Elder <elder@linaro.org>
Date: Thu, 12 Mar 2020 11:44:26 -0500

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

Series applied, thanks Alex.