Re: [git patches] libata updates

[Jeff Garzik]

On 07/25/2012 06:06 PM, Linus Torvalds wrote:
> On Wed, Jul 25, 2012 at 1:43 PM, Jeff Garzik <jeff@xxxxxxxxxx> 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.

Tried to add some explanation to the merge commit itself, giving plenty 
of detail.

Even so, separately, it still needed that post-merge compile fix.

	Jeff



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