On Sun, Oct 22, 2023 at 12:24:55PM +0200, Florian Eckert wrote: > On 2023-10-21 18:28, Greg KH wrote: > > On Thu, Oct 19, 2023 at 01:28:07PM +0200, Florian Eckert wrote: > > > Tabs were used in the function description, to make this look more > > > uniform, the tabs were replaced by spaces where necessary. > > > > > > While we're at it, I also replaced the 'ndashes' with simple dashes, > > > since > > > only those are supported by sphinx. > > > > > > Reviewed-by: Jiri Slaby <jirislaby@xxxxxxxxxx> > > > Signed-off-by: Florian Eckert <fe@xxxxxxxxxx> > > > --- > > > drivers/tty/tty_io.c | 102 > > > +++++++++++++++++++++---------------------- > > > 1 file changed, 51 insertions(+), 51 deletions(-) > > > > This didn't apply cleanly as portions of this patch were already in my > > tree, what did tree did you make it against? > > I have already seen that I should add a base commit next time. > So I made it against the master from last week. > > However, I was not sure which tree to use as I am changing > something in the tty and led subsystem- > > > Anyway, I've fixed it up and taken it now. > > Thank you for adopting my change and correcting my commit so that > it can be applied cleanly. > > I will not add this patch in the next series, as it is already in the > tty-testing branch [1] from you? That is correct, thanks! greg k-h
