Re: [GIT PULL] SafeSetID changes for v5.10
From: Linus Torvalds
Date: Fri Oct 23 2020 - 13:58:02 EST
On Thu, Oct 15, 2020 at 5:01 PM Micah Morton <mortonm@xxxxxxxxxxxx> wrote:
>
> I just rebased to v5.9 to make sure the 1-line changes that touch
> kernel/capability.c, kernel/groups.c and kernel/sys.c still applied
> cleanly without conflicts. Should I have rebased onto one of the -rc's
> for v5.9 instead?
No. You shouldn't have rebased at all.
Making sure something applies cleanly is simply not a reason to rebase.
See
Documentation/maintainer/rebasing-and-merging.rst
for some common rules.
Linus