* [PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next
@ 2012-07-12 7:05 ` Gerard Snitselaar
0 siblings, 0 replies; 4+ messages in thread
From: Gerard Snitselaar @ 2012-07-12 7:05 UTC (permalink / raw)
To: linux-next; +Cc: linux-kernel, linuxppc-dev, stuart.yoder, benh
Commit 9778b696 (powerpc: Use CURRENT_THREAD_INFO instead of open
coded assembly) got a rejected merge file iommu.c.rej committed with
it.
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
--
1.7.11.1.165.g299666c
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next
@ 2012-07-12 7:05 ` Gerard Snitselaar
0 siblings, 0 replies; 4+ messages in thread
From: Gerard Snitselaar @ 2012-07-12 7:05 UTC (permalink / raw)
To: linux-next; +Cc: linuxppc-dev, linux-kernel, stuart.yoder
Commit 9778b696 (powerpc: Use CURRENT_THREAD_INFO instead of open
coded assembly) got a rejected merge file iommu.c.rej committed with
it.
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
--
1.7.11.1.165.g299666c
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next
2012-07-12 7:05 ` Gerard Snitselaar
@ 2012-07-12 11:23 ` Benjamin Herrenschmidt
-1 siblings, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2012-07-12 11:23 UTC (permalink / raw)
To: Gerard Snitselaar; +Cc: linux-next, linux-kernel, linuxppc-dev, stuart.yoder
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next
@ 2012-07-12 11:23 ` Benjamin Herrenschmidt
0 siblings, 0 replies; 4+ messages in thread
From: Benjamin Herrenschmidt @ 2012-07-12 11:23 UTC (permalink / raw)
To: Gerard Snitselaar; +Cc: linux-next, linuxppc-dev, linux-kernel, stuart.yoder
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-07-12 11:23 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-12 7:05 [PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next Gerard Snitselaar
2012-07-12 7:05 ` Gerard Snitselaar
2012-07-12 11:23 ` Benjamin Herrenschmidt
2012-07-12 11:23 ` Benjamin Herrenschmidt
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.