From: Benjamin Herrenschmidt <benh@kernel.crashing.org>
To: Gerard Snitselaar <dev@snitselaar.org>
Cc: linux-next@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-kernel@vger.kernel.org, stuart.yoder@freescale.com
Subject: Re: [PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next
Date: Thu, 12 Jul 2012 21:23:21 +1000 [thread overview]
Message-ID: <1342092201.15597.0.camel@pasglop> (raw)
In-Reply-To: <1342076734-30996-1-git-send-email-dev@snitselaar.org>
On Thu, 2012-07-12 at 00:05 -0700, Gerard Snitselaar wrote:
> Commit 9778b696 (powerpc: Use CURRENT_THREAD_INFO instead of open
> coded assembly) got a rejected merge file iommu.c.rej committed with
> it.
Oops, that's me having too much coffee & using git citool ... I'll get
rid of it, thanks.
Cheers,
Ben.
> Signed-off-by: Gerard Snitselaar <dev@snitselaar.org>
> ---
> arch/powerpc/kernel/iommu.c.rej | 22 ----------------------
> 1 file changed, 22 deletions(-)
> delete mode 100644 arch/powerpc/kernel/iommu.c.rej
>
> diff --git a/arch/powerpc/kernel/iommu.c.rej b/arch/powerpc/kernel/iommu.c.rej
> deleted file mode 100644
> index 9d10d34..0000000
> --- a/arch/powerpc/kernel/iommu.c.rej
> +++ /dev/null
> @@ -1,22 +0,0 @@
> ---- arch/powerpc/kernel/iommu.c 2012-06-08 09:01:02.785709100 +1000
> -+++ arch/powerpc/kernel/iommu.c 2012-06-08 09:01:07.489784856 +1000
> -@@ -33,7 +33,9 @@
> - #include <linux/bitmap.h>
> - #include <linux/iommu-helper.h>
> - #include <linux/crash_dump.h>
> -+#include <linux/fault-inject.h>
> - #include <asm/io.h>
> -+#include <asm/vio.h>
> - #include <asm/prom.h>
> - #include <asm/iommu.h>
> - #include <asm/pci-bridge.h>
> -@@ -171,6 +261,9 @@
> - return DMA_ERROR_CODE;
> - }
> -
> -+ if (should_fail_iommu(dev))
> -+ return DMA_ERROR_CODE;
> -+
> - if (handle && *handle)
> - start = *handle;
> - else
prev parent reply other threads:[~2012-07-12 11:23 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-12 7:05 [PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next Gerard Snitselaar
2012-07-12 11:23 ` Benjamin Herrenschmidt [this message]
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=1342092201.15597.0.camel@pasglop \
--to=benh@kernel.crashing.org \
--cc=dev@snitselaar.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=stuart.yoder@freescale.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).