Hi Darren,
On Sat, 14 Mar 2015 14:06:12 -0700 Darren Hart <dvhart@xxxxxxxxxxxxx> wrote:
>
> On Wed, Mar 11, 2015 at 12:34:50PM +0300, Dan Carpenter wrote:
> > This needs to be signed for the error handling to work. Valid modes are
> > small positive integers.
> >
> > Fixes: b790ceeb0fd9 ('thinkpad_acpi: Add adaptive_kbd_mode sysfs attr')
> > Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
> >
>
> Question for HPA, Rafael, and Stephen,
>
> I recall discussion at Kernel Summit 2014 about not rebasing or merging patches
> when sending to Linus, that he'd prefer to see the history. I recall Stephen
> mentioning something similar for linux-next.
>
> That said, I've seen varying behavior among maintainers with respect to fixes
> like this one from Dan. This patch fixes a patch that currently only exists in
> my for-next and Stephen's linux-next trees.
>
> What is the preference. Do I just queue it up to for-next as is (this is what
> I've done for now), or do I roll it into the referred patch causing the error
> and credit Dan with the fixup?
The only answer, is "it depends" :-) If it will cause problems for
people doing bisects, or if it is just the last one of two commits on
the top of your tree, it seems like it is OK to just squash the fix
into the original patch (with attribution as you say). Otherwise, I
would prefer that trees just progress with no rebasing.
> Left to my own devices I would prefer not to introduce bugs into the
> kernel history if I can help it. That said, I don't want to make
> extra work for Stephen or Linus.
It is very unusual for a small rebase to cause me any more work (unless
the files involved and modified by other trees). And for Linus, well
all he sees is the tree that you submit to him.
The people you will inconvenience more by rebasing are the developers
who write patches that are based on your tree. If you rebase under
them, they may have to rebase and fix up the patches they have already
tested and had reviewed before they can then submit them to you
(hopefully before you rebase again).
Dave Miller seems to get on quite well in the networking tree with no
rebasing at all ...
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgpfxVLBYyrkS.pgp
Description: OpenPGP digital signature
