Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1219666

Re: [GIT PULL REQUEST] md updates for 4.3

Show all headers | View raw

On Sat, Sep 5, 2015 at 2:37 AM, Neil Brown <neil@brown.name> wrote:
>
> Please pull these updates.  I've already merged with the 'block' tree
> to resolve a few simple conflicts.

So for the future, I actually prefer to see and handle the conflicts myself.

I really just prefer knowing what's going on, and merge conflicts are
an indication of cross-maintainer issues which are *exactly* the kinds
of things I want to be aware of.

However, in this case I was "ok, I've already done several other merge
resolutions with the wbole damn bio_endio error handling changes", so
I felt I was aware enough about how that ended up being a
cross-subsystem conflict, and just took your pre-merged version.

If you feel that the conflicts are particularly subtle, or just
generally worry about the merge, or just because you want to do some
merge-testing, what some people end up doing is to send me their
unmerged branch, and then send me a separate ".. and here's the merge
I did". I'll then do the merge myself anyway, but then after doing the
merge I'll switch to a temporary testing branch and re-do the  merge
with the pre-merged state just to verify. Generally the end result is
identical, but when it isn't, that's actually usually interesting
(sometimes it's just a ordering difference, but sometimes it's a merge
error - and so far I think most merge errors have come from
sub-maintainers, for the simple reason that they generally aren't as
used to merging as I am - so even if they know the code better, I
sometimes catch merge gotcha's better).

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

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[GIT PULL REQUEST] md updates for 4.3 Neil Brown <neil@brown.name> - 2015-09-05 11:40 +0200
  Re: [GIT PULL REQUEST] md updates for 4.3 Linus Torvalds <torvalds@linux-foundation.org> - 2015-09-06 03:10 +0200

csiph-web