Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200602141048.1995-1-warthog618@gmail.com> <CAMpxmJUjYn5SHg3BpCeKbYc_OpCjd8d943yfYL_TF15wyTenfA@mail.gmail.com>
 <20200604141804.GA5050@sol> <CAMpxmJXyVO4unLQOzC0xf47CTmK6VurTk+Q=9RDWhcP0pu73pQ@mail.gmail.com>
 <20200604233043.GA8913@sol>
In-Reply-To: <20200604233043.GA8913@sol>
From:   Bartosz Golaszewski <bgolaszewski@baylibre.com>
Date:   Fri, 5 Jun 2020 11:26:45 +0200
Message-ID: <CAMpxmJXX+rDFNfBqrBg3hKMApLKDnbFL6S1ZNz_BBi=zO7+aPQ@mail.gmail.com>
Subject: Re: [PATCH v2] gpiolib: split character device into gpiolib-cdev
To:     Kent Gibson <warthog618@gmail.com>
Cc:     LKML <linux-kernel@vger.kernel.org>,
        linux-gpio <linux-gpio@vger.kernel.org>,
        Linus Walleij <linus.walleij@linaro.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

pt., 5 cze 2020 o 01:30 Kent Gibson <warthog618@gmail.com> napisa=C5=82(a):
>
> On Thu, Jun 04, 2020 at 06:22:43PM +0200, Bartosz Golaszewski wrote:
> > czw., 4 cze 2020 o 16:18 Kent Gibson <warthog618@gmail.com> napisa=C5=
=82(a):
> > >
> > > >
> > > > Is this comment relevant for the character device?
> > > >
> > >
> > > True - that comment should stay in gpiolib, and gpiolib-cdev should g=
et
> > > 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 one=
s,
> > > then moving one of those back to the old name, but not sure if that i=
s
> > > 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.
>

It's not like this information is lost: once you see (with git blame)
that a file has been moved, you can check out the revision from before
the move and see the file's history. Rinse and repeat if it was moved
more than once.

> 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?
>

Linus W already sent out his main PR to Linus T. Sometimes he does
additional PRs near the end of the merge window so maybe we can get it
in this way?

Bart