Gentoo Archives: gentoo-user

From: Alan Mackenzie <acm@×××.de>
To: gentoo-user@l.g.o
Subject: Re: [gentoo-user] Advice sought on the use of a VCS (specifically git) to keep track of my Softscroll patch.
Date: Fri, 24 Sep 2021 17:47:32
Message-Id: YU4PLMphelh5do1W@ACM
In Reply to: Re: [gentoo-user] Advice sought on the use of a VCS (specifically git) to keep track of my Softscroll patch. by Marco Rebhan
1 Hello, Marco.
2
3 On Thu, Sep 23, 2021 at 21:27:26 +0200, Marco Rebhan wrote:
4 > On Thursday, 23 September 2021 20:23:57 CEST Alan Mackenzie wrote:
5 > > Where would I find a suitable kernel git repository to clone? An
6 > > "official" repository, whatever that means? Ideally, I want one with
7 > > just the various kernel releases, not one containing gigabytes of
8 > > intermediate versions. Where would I even start searching to find
9 > > this out?
10
11 > Hey Alan,
12
13 > The official repository I think is
14 > https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/.
15 > What I would do is apply your patch on top of that, and then to update
16 > it, rebase the patch onto the new upstream commit you want to update to.
17 > This leads to your patches always being at the tip of the commit history
18 > and not somewhere buried between commits from upstream.
19
20 Thanks, that was a very great deal of help. Rather than downloading the
21 /torvalds/ repo, I went for /linux-stable-rc/, which appears to have
22 release versions going back a long, long way. It has a tag for every
23 such version, which is just what I wanted.
24
25 So far, I've constructed a clean patch which applies to 5.14.5, for
26 Jorge Almeida. Maybe I can clean up the others over the weekend.
27
28 I've decided to create a single branch for each kernel version I'm
29 patching. So, so far, I've got a branch called scroll-5.14.5. From
30 that I have recreated a clean diff file for that version. I may
31 not be doing a lot of rebasing, since I'm creating patches for already
32 released versions rather than keeping up to date with the head of the
33 master branch.
34
35 > However, this rewrites git history so you'd have to force push the
36 > branch to whatever remote you're tracking it in, so keep that in mind.
37
38 I don't envisage any upstream accepting my patch. The powers that be
39 were adamant that the soft scrolling be removed from the official
40 kernel, ostensibly due to security reasons. I may get around to posting
41 the patch on the Gentoo wiki, but for now it'll just be on the mailing
42 list, plus to any individual Linux user who asks for a copy.
43
44 > You could do this though and additionally have another branch where you
45 > track the patch files themselves that are rebased onto a certain kernel
46 > commit (you can export them with "git format-patch upstream/master" if
47 > upstream/master is whatever branch the patch is currently rebased on).
48 > That of course you don't have to then force push.
49
50 I'll probably have a more static system than that, doing a git pull when
51 after a new gentoo-sources is released.
52
53 > I hope this helps :P
54
55 It did indeed. Thanks!
56
57 > -Marco
58
59 --
60 Alan Mackenzie (Nuremberg, Germany).

Replies