Hi, Yoshihiro Shimoda <[email protected]> writes: > Hi Felipe-san, > >> From: Felipe Balbi, Sent: Tuesday, October 2, 2018 9:18 PM >> >> Yoshihiro Shimoda <[email protected]> writes: >> >> > This patch adds bindings for r8a77990 (R-Car E3). >> > >> > Signed-off-by: Yoshihiro Shimoda <[email protected]> >> > --- >> > 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 <[email protected]> > 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 <[email protected]> > Reviewed-by: Biju Das <[email protected]> > Reviewed-by: Simon Horman <[email protected]> > Reviewed-by: Rob Herring <[email protected]> > Reviewed-by: Yoshihiro Shimoda <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > > 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? -- balbi
signature.asc
Description: PGP signature
