On Thu, Jun 04, 2020 at 06:22:43PM +0200, Bartosz Golaszewski wrote: > czw., 4 cze 2020 o 16:18 Kent Gibson <warthog618@xxxxxxxxx> napisał(a): > > > > > > > > Is this comment relevant for the character device? > > > > > > > True - that comment should stay in gpiolib, and gpiolib-cdev should get > > one of it's own. > > > > Any suggestions on how to maintain line history? > > I know you can trick git by moving the original file into two new ones, > > then moving one of those back to the old name, but not sure if that is > > what you would want to see in a patch. > > > > People don't seem to care much about this in the kernel. Files get > moved and git blame results get lost all the time. Don't stress about > it. > Oh, ok. I guess that explains why I couldn't find any examples of how to do it in a patch - I had thought I wasn't looking hard enough. There are still a couple of commits in gpio/fixes that will conflict - are those getting merged into gpio/devel any time soon? Or is there another branch I should rebase onto? Cheers, Kent.