netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: elder@linaro.org
Cc: bjorn.andersson@linaro.org, agross@kernel.org,
	robh+dt@kernel.org, mark.rutland@arm.com, netdev@vger.kernel.org,
	devicetree@vger.kernel.org, linux-arm-msm@vger.kernel.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH 0/2] net: fix net-next
Date: Thu, 12 Mar 2020 15:48:52 -0700 (PDT)	[thread overview]
Message-ID: <20200312.154852.115271760293062652.davem@davemloft.net> (raw)
In-Reply-To: <20200312164428.18132-1-elder@linaro.org>

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.

      parent reply	other threads:[~2020-03-12 22:48 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-12 16:44 [PATCH 0/2] net: fix net-next Alex Elder
2020-03-12 16:44 ` [PATCH 1/2] bitfield.h: add FIELD_MAX() and field_max() Alex Elder
2020-03-12 16:44 ` [PATCH 2/2] Revert "arm64: dts: sdm845: add IPA information" Alex Elder
2020-03-12 22:48 ` David Miller [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200312.154852.115271760293062652.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=agross@kernel.org \
    --cc=bjorn.andersson@linaro.org \
    --cc=devicetree@vger.kernel.org \
    --cc=elder@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mark.rutland@arm.com \
    --cc=netdev@vger.kernel.org \
    --cc=robh+dt@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).