Message ID | 20180725143850.32985-1-chris.brandt@renesas.com (mailing list archive) |
---|---|
Headers | show |
Series | serial: sh-sci: Add support for RZ/A2 | expand |
Hi Chris, On Wed, Jul 25, 2018 at 4:39 PM Chris Brandt <chris.brandt@renesas.com> wrote: > The RZ/A2 uses a modified SCIF that until recently was only used in > Renesas MCU devices (not MPU devices). > So, while it functions mostly the same as a normal SCIF, some things > needed to be shifted around. > > In the end, a standard compatible = "renesas,scif" is all that is really > needed (not a SoC specific "renesas,scif-r7s9210"). > Chris Brandt (3): > serial: sh-sci: Allow for compressed SCIF address space > serial: sh-sci: Add support for separate TEI+DRI interrupts > serial: sh-sci: Document r7s9210 bindings > > .../bindings/serial/renesas,sci-serial.txt | 17 +++++- > drivers/tty/serial/sh-sci.c | 66 ++++++++++++++++++---- > 2 files changed, 70 insertions(+), 13 deletions(-) Thanks for your series! Unfortunately Greg has already applied your v1 (and my fix for a use-after-free), so either these have to be reverted first, or you have to rebase against tty-next. Gr{oetje,eeting}s, Geert
Hi Geert, On Thursday, July 26, 2018, Geert Uytterhoeven wrote: > Thanks for your series! > > Unfortunately Greg has already applied your v1 (and my fix for a > use-after-free), so either these have to be reverted first, or you have to > rebase against tty-next. I assume you would prefer the newer implementation I did. In your opinion, which one would be better (revert or rebase)? Thanks, Chris
Hi Chris, On Thu, Jul 26, 2018 at 2:25 PM Chris Brandt <Chris.Brandt@renesas.com> wrote: > On Thursday, July 26, 2018, Geert Uytterhoeven wrote: > > Thanks for your series! > > > > Unfortunately Greg has already applied your v1 (and my fix for a > > use-after-free), so either these have to be reverted first, or you have to > > rebase against tty-next. > > I assume you would prefer the newer implementation I did. > > In your opinion, which one would be better (revert or rebase)? [looking at the incremental differences] I think the easiest for Greg is to rebase, and send 3 patches: 1. Document interrupt order in bindings, 2. Unify SCIx_RZ_SCIFA_REGTYPE/SCIx_SH4_SCIF_REGTYPE regtypes, 3. Simplify interrupts. Thanks! Gr{oetje,eeting}s, Geert
Hi Geert, On Thursday, July 26, 2018, Geert Uytterhoeven wrote: > > In your opinion, which one would be better (revert or rebase)? > > [looking at the incremental differences] > > I think the easiest for Greg is to rebase, and send 3 patches: > 1. Document interrupt order in bindings, > 2. Unify SCIx_RZ_SCIFA_REGTYPE/SCIx_SH4_SCIF_REGTYPE regtypes, > 3. Simplify interrupts. Thank you! Chris
On Thu, Jul 26, 2018 at 03:01:11PM +0200, Geert Uytterhoeven wrote: > Hi Chris, > > On Thu, Jul 26, 2018 at 2:25 PM Chris Brandt <Chris.Brandt@renesas.com> wrote: > > On Thursday, July 26, 2018, Geert Uytterhoeven wrote: > > > Thanks for your series! > > > > > > Unfortunately Greg has already applied your v1 (and my fix for a > > > use-after-free), so either these have to be reverted first, or you have to > > > rebase against tty-next. > > > > I assume you would prefer the newer implementation I did. > > > > In your opinion, which one would be better (revert or rebase)? > > [looking at the incremental differences] > > I think the easiest for Greg is to rebase, and send 3 patches: Greg does not rebase his public trees. Nor should anyone else :) I can revert patches if you want me to, just let me know what ones. Or send incremental patches on top of my tree please. But no reverts are going to be happening. thanks, greg k-h
On Saturday, July 28, 2018 1, Greg KH wrote: > > > In your opinion, which one would be better (revert or rebase)? > > > > [looking at the incremental differences] > > > > I think the easiest for Greg is to rebase, and send 3 patches: > > Greg does not rebase his public trees. Nor should anyone else :) > > I can revert patches if you want me to, just let me know what ones. Or > send incremental patches on top of my tree please. But no reverts are > going to be happening. Yesterday I sent a new patch series that will apply on top of the current tty-next and basically reverts what I did and replaces it with a new version that incorporates Geert's suggestions. So no reverts are needed. I assume now I'm just waiting to see if Geert has any feedback on the new series. Chris
Hi Greg, On Sat, Jul 28, 2018 at 4:55 PM Greg KH <gregkh@linuxfoundation.org> wrote: > On Thu, Jul 26, 2018 at 03:01:11PM +0200, Geert Uytterhoeven wrote: > > On Thu, Jul 26, 2018 at 2:25 PM Chris Brandt <Chris.Brandt@renesas.com> wrote: > > > On Thursday, July 26, 2018, Geert Uytterhoeven wrote: > > > > Thanks for your series! > > > > > > > > Unfortunately Greg has already applied your v1 (and my fix for a > > > > use-after-free), so either these have to be reverted first, or you have to > > > > rebase against tty-next. > > > > > > I assume you would prefer the newer implementation I did. > > > > > > In your opinion, which one would be better (revert or rebase)? > > > > [looking at the incremental differences] > > > > I think the easiest for Greg is to rebase, and send 3 patches: > > Greg does not rebase his public trees. Nor should anyone else :) I know ;-) FTR, the sentence above was addressed to Chris: "I think the easiest for Greg(,) is (for you) to rebase (your tree), and send 3 patches". Which is what Chris did in the mean time. Apparently I didn't formulate it well. Will try to do better in the future. Gr{oetje,eeting}s, Geert
On Sat, Jul 28, 2018 at 03:55:14PM +0000, Chris Brandt wrote: > On Saturday, July 28, 2018 1, Greg KH wrote: > > > > In your opinion, which one would be better (revert or rebase)? > > > > > > [looking at the incremental differences] > > > > > > I think the easiest for Greg is to rebase, and send 3 patches: > > > > Greg does not rebase his public trees. Nor should anyone else :) > > > > I can revert patches if you want me to, just let me know what ones. Or > > send incremental patches on top of my tree please. But no reverts are > > going to be happening. s/no reverts/no rebases/ ? > > Yesterday I sent a new patch series that will apply on top of the > current tty-next and basically reverts what I did and replaces it with a > new version that incorporates Geert's suggestions. So no reverts are > needed. > > I assume now I'm just waiting to see if Geert has any feedback on the > new series. > > Chris >