lkml.org 
[lkml]   [2013]   [Sep]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
SubjectRe: linux-next: back merge of Linus' tree into the vfio tree
From
Date
On Fri, 2013-09-06 at 09:08 +1000, Stephen Rothwell wrote:
> Hi Alex,
>
> I noticed that you have back merged Linus' tree into yours. Linus
> usually takes a dim view of that - especially when there is no
> explanation in the merge commit message. i.e. you shouldn't to that
> unless you really need to - and then you should explain why you did it.

Hmm, I was hoping that wouldn't be a problem, especially with no
conflicts in the merge. I did it because the first commit after the
merge in my next tree depends on PCI changes that have already been
merged by Linus. Re-basing is an even bigger sin and I felt it better
to do a merge than ask for two pulls or add an unbuild-able commit to my
next tree. How do you suggest that I resolve this? Thanks,

Alex





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