All of lore.kernel.org
 help / color / mirror / Atom feed
From: Joerg Roedel <joro-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
To: Linus Torvalds
	<torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org>
Cc: iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org,
	Linux Kernel Mailing List
	<linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: Re: [git pull] IOMMU Updates for Linux v4.2
Date: Wed, 24 Jun 2015 09:09:02 +0200	[thread overview]
Message-ID: <20150624070902.GA18569@8bytes.org> (raw)
In-Reply-To: <CA+55aFxZL24-8H1e=zYaVYrvnO-T01kqUN4R6DFF37TOHdi=Gw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>

On Tue, Jun 23, 2015 at 06:47:15PM -0700, Linus Torvalds wrote:
> 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.

Your resolution looks good (there is only a missing newline after the
declarations in intel_free_irq_resources). The only other difference to
my resolution is that you kept the new set_irq_posting_cap() function at
the original location, I moved it to a different place in the file. But
these differences don't matter for functionality, so everything is fine :)


Thanks,

	Joerg

WARNING: multiple messages have this Message-ID (diff)
From: Joerg Roedel <joro@8bytes.org>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	iommu@lists.linux-foundation.org
Subject: Re: [git pull] IOMMU Updates for Linux v4.2
Date: Wed, 24 Jun 2015 09:09:02 +0200	[thread overview]
Message-ID: <20150624070902.GA18569@8bytes.org> (raw)
In-Reply-To: <CA+55aFxZL24-8H1e=zYaVYrvnO-T01kqUN4R6DFF37TOHdi=Gw@mail.gmail.com>

On Tue, Jun 23, 2015 at 06:47:15PM -0700, Linus Torvalds wrote:
> 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.

Your resolution looks good (there is only a missing newline after the
declarations in intel_free_irq_resources). The only other difference to
my resolution is that you kept the new set_irq_posting_cap() function at
the original location, I moved it to a different place in the file. But
these differences don't matter for functionality, so everything is fine :)


Thanks,

	Joerg


  parent reply	other threads:[~2015-06-24  7:09 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-06-23  9:24 [git pull] IOMMU Updates for Linux v4.2 Joerg Roedel
2015-06-23  9:24 ` Joerg Roedel
     [not found] ` <20150623092412.GA25264-zLv9SwRftAIdnm+yROfE0A@public.gmane.org>
2015-06-24  1:47   ` Linus Torvalds
2015-06-24  1:47     ` Linus Torvalds
     [not found]     ` <CA+55aFxZL24-8H1e=zYaVYrvnO-T01kqUN4R6DFF37TOHdi=Gw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
2015-06-24  7:09       ` Joerg Roedel [this message]
2015-06-24  7:09         ` Joerg Roedel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20150624070902.GA18569@8bytes.org \
    --to=joro-zlv9swrftaidnm+yrofe0a@public.gmane.org \
    --cc=iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org \
    --cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=torvalds-de/tnXTf+JLsfHDXvbKv3WD2FQJk+8+b@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.