From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751426AbbFXHJJ (ORCPT ); Wed, 24 Jun 2015 03:09:09 -0400 Received: from 8bytes.org ([81.169.241.247]:35555 "EHLO theia.8bytes.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751116AbbFXHJE (ORCPT ); Wed, 24 Jun 2015 03:09:04 -0400 Date: Wed, 24 Jun 2015 09:09:02 +0200 From: Joerg Roedel To: Linus Torvalds Cc: Linux Kernel Mailing List , iommu@lists.linux-foundation.org Subject: Re: [git pull] IOMMU Updates for Linux v4.2 Message-ID: <20150624070902.GA18569@8bytes.org> References: <20150623092412.GA25264@8bytes.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.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