lkml.org 
[lkml]   [2012]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [git patches] libata updates
    On Wed, Jul 25, 2012 at 1:43 PM, Jeff Garzik <jeff@garzik.org> wrote:
    > On Wed, Jul 25, 2012 at 04:35:51PM -0400, Jeff Garzik wrote:
    >> Please pull 641589bff714f39b33ef1d7f02eaa009f2993b64 from
    >> git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/libata-dev.git tags/upstream
    >>
    >
    > Oh, I forgot to point out the merge commit, making my HEAD more recent
    > than might be expected. There was a merge conflict and an API change
    > that needed to be dealt with, in order for your pull to be correct.

    So I'd *much* rather see an explanation of what the conflict is when
    you ask me to pull, and let me handle it, rather than you pre-merging
    things for me. I *want* to see conflicts between subsystems.
    Seriously.

    Linus


    \
     
     \ /
      Last update: 2012-07-26 00:41    [W:0.035 / U:36.040 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site