Re: [git pull] IOMMU Updates for Linux v4.2

[Linus Torvalds]

On Tue, Jun 23, 2015 at 2:24 AM, Joerg Roedel <joro@xxxxxxxxxx> wrote:
>
> I attached my resolution of the conflicts to this pull-request and
> compiled and run-time tested my resolution on an Intel VT-d and an
> AMD IOMMU machine.

Hmm. My resolution doesn't look the same at all, but that could easily
be due to trivial differences. I tried to make as much sense of the
merge as possible, so I think my merge is fine, but it's also entirely
possible I screwed something up.

In general, when there are complex merges, I still tend to prefer to
do them myself, but if you *also* have a pre-merged branch, I can then
compare my merge against yours. I tend find that the maintainer has
had a broken merge more often than mine (just because I'm so used to
merging), but the reverse also does happen, and it's often very useful
to be able to compare the two merges for sanity.

And for conflicts that are trivial, don't even bother. In this case,
like you to double-check my end result. It looks sane, and it
compiles, but hey..

              Linus
--
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/