lkml.org 
[lkml]   [2013]   [Sep]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: [GIT PULL] Keyrings patches
From
Date
On Wed, 2013-09-18 at 12:53 +0100, David Howells wrote:
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> > Is there some reason that those fixups cannot be done in a merge commit?
> > i.e. are they more than simple text updates?

Hi Stephen, the issue is that the patches were created against a newer
kernel (eg. next, akpm, Linus' branch), not the earlier one. So it
isn't a merge issue per se. Now that -rc1 is out, James will rebase
soon.

Mimi

> That's somewhat up to James. *He* would be the person doing the merge, not
> me. I'm changing the lines in my patches also.
>
> > /me thinks that most rebases people do can be better done (and
> > documented) as merges.
>
> That depends on how you define "better". Better for what? I think it's
> better to absorb the changes into my patch series. StGIT is very good for
> handling this, since my patches are currently maintained as an StGIT set.
> That way, there ends up one fewer commit in the history, assuming no other
> collisions with what James merges.
>
> David





\
 
 \ /
  Last update: 2013-09-18 15:01    [W:0.075 / U:0.048 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site