linux-kernel - Re: linux-next: back merge of Linus' tree into the vfio tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1378422869.3246.282.camel@ul30vt.home>
Date:	Thu, 05 Sep 2013 17:14:29 -0600
From:	Alex Williamson <alex.williamson@...hat.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: linux-next: back merge of Linus' tree into the vfio tree

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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/