From: "gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
To: Felipe Balbi <balbi@kernel.org>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
"robh+dt@kernel.org" <robh+dt@kernel.org>,
"mark.rutland@arm.com" <mark.rutland@arm.com>,
"linux-usb@vger.kernel.org" <linux-usb@vger.kernel.org>,
"linux-renesas-soc@vger.kernel.org"
<linux-renesas-soc@vger.kernel.org>,
"devicetree@vger.kernel.org" <devicetree@vger.kernel.org>
Subject: Re: [PATCH 1/2] dt-bindings: usb: renesas_usb3: add bindings for r8a77990
Date: Tue, 2 Oct 2018 10:36:27 -0700 [thread overview]
Message-ID: <20181002173627.GA12821@kroah.com> (raw)
In-Reply-To: <87pnws8q95.fsf@linux.intel.com>
On Tue, Oct 02, 2018 at 03:52:38PM +0300, Felipe Balbi wrote:
>
> Hi,
>
> Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> writes:
> > Hi Felipe-san,
> >
> >> From: Felipe Balbi, Sent: Tuesday, October 2, 2018 9:18 PM
> >>
> >> Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com> writes:
> >>
> >> > This patch adds bindings for r8a77990 (R-Car E3).
> >> >
> >> > Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> >> > ---
> >> > Documentation/devicetree/bindings/usb/renesas_usb3.txt | 1 +
> >> > 1 file changed, 1 insertion(+)
> >> >
> >> > diff --git a/Documentation/devicetree/bindings/usb/renesas_usb3.txt
> >> b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
> >> > index b22f0a5..d366555 100644
> >> > --- a/Documentation/devicetree/bindings/usb/renesas_usb3.txt
> >> > +++ b/Documentation/devicetree/bindings/usb/renesas_usb3.txt
> >> > @@ -6,6 +6,7 @@ Required properties:
> >> > - "renesas,r8a7795-usb3-peri"
> >> > - "renesas,r8a7796-usb3-peri"
> >> > - "renesas,r8a77965-usb3-peri"
> >> > + - "renesas,r8a77990-usb3-peri"
> >> > - "renesas,rcar-gen3-usb3-peri" for a generic R-Car Gen3 or RZ/G2
> >> > compatible device
> >>
> >> oops:
> >>
> >> checking file Documentation/devicetree/bindings/usb/renesas_usb3.txt
> >> Hunk #1 FAILED at 6.
> >> 1 out of 1 hunk FAILED
> >>
> >> could you rebase against testing/next?
> >
> > Sorry for lack information.
> > If possible, would you review/apply the following patch at first?
> >
> > https://patchwork.kernel.org/patch/10574879/
> >
> > Greg-san's repo already merged the patch like below:
> >
> > commit 28da90f19cdec24d669d75942fec227f4de37abd
> > Author: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> > Date: Fri Aug 24 08:56:15 2018 +0100
> >
> > usb: gadget: udc: renesas_usb3: Add r8a774a1 support
> >
> > Document RZ/G2M (R8A774A1) SoC bindings.
> >
> > Signed-off-by: Fabrizio Castro <fabrizio.castro@bp.renesas.com>
> > Reviewed-by: Biju Das <biju.das@bp.renesas.com>
> > Reviewed-by: Simon Horman <horms+renesas@verge.net.au>
> > Reviewed-by: Rob Herring <robh@kernel.org>
> > Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >
> >
> > I think that almost all patches I or other guys sent for usb gadget are already
> > merged into Greg-san's repo like below:
>
> oh, understood. I can rebase my pull request on Greg's branch,
> then. Greg, would you prefer that to avoid duplicated commits?
duplicated commits are fine, I don't mind them :)
next prev parent reply other threads:[~2018-10-02 17:36 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 11:58 [PATCH 0/2] usb: gadget: udc: renesas_usb3: add support for r8a77990 Yoshihiro Shimoda
2018-10-02 11:58 ` [PATCH 1/2] dt-bindings: usb: renesas_usb3: add bindings " Yoshihiro Shimoda
2018-10-02 12:17 ` Felipe Balbi
2018-10-02 12:35 ` Yoshihiro Shimoda
2018-10-02 12:52 ` Felipe Balbi
2018-10-02 17:36 ` gregkh [this message]
2018-10-02 11:58 ` [PATCH 2/2] usb: gadget: udc: renesas_usb3: add support " Yoshihiro Shimoda
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=20181002173627.GA12821@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=balbi@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=yoshihiro.shimoda.uh@renesas.com \
/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).