From patchwork Thu Jul 12 07:05:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerard Snitselaar X-Patchwork-Id: 170586 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 6F93B2C0477 for ; Thu, 12 Jul 2012 17:28:30 +1000 (EST) Received: from mail-pb0-f51.google.com (mail-pb0-f51.google.com [209.85.160.51]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 24E002C0205 for ; Thu, 12 Jul 2012 17:05:49 +1000 (EST) Received: by pbbrp16 with SMTP id rp16so3402087pbb.38 for ; Thu, 12 Jul 2012 00:05:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=azATTGwmz40jb6AnJvovkWmYuw8g+FoIGGc8zhuOQ1M=; b=R6pBfydOEAPSOH84Pu3Qzxb1qAcGVFKaKjyh8fGQ2XJB+rxSCcO0bbgOiluS2hyiw3 Eq2vq1+AD0hUZz2Ojsf7+2/YtL0z7vjxucjUueqpD0LuV7t/jaw+VhqcvS07+xO9uZ3g Ej8qJJr+cZch7VxbAfZPUo4wOTF7nYcz+IFb+3/syttpy8y4x7/J4H3O4bu7cGBHrdCU WkdkWvSnWd7u03iLspcnclKO2VnCJWdU58MAglLkU/0AH7Gm6i6Nc11fGKwTKscJOT4R F4ndYaK5DhH/y9aUBLkz35x7UbpoebQsOHt6UWcCVtnDhZtMpTvw7wpNTcBFMgfBK7fC mFTg== Received: by 10.68.193.226 with SMTP id hr2mr2794439pbc.155.1342076747398; Thu, 12 Jul 2012 00:05:47 -0700 (PDT) Received: from cantor.Home (75-167-7-117.phnx.qwest.net. [75.167.7.117]) by mx.google.com with ESMTPS id qd2sm3297368pbb.29.2012.07.12.00.05.45 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 Jul 2012 00:05:46 -0700 (PDT) From: Gerard Snitselaar To: linux-next@vger.kernel.org Subject: [PATCH] powerpc: remove rejected merge file from arch/powerpc/kernel in linux-next Date: Thu, 12 Jul 2012 00:05:34 -0700 Message-Id: <1342076734-30996-1-git-send-email-dev@snitselaar.org> X-Mailer: git-send-email 1.7.11.1.165.g299666c X-Gm-Message-State: ALoCoQnwMKIHiaWFSCGFsxEOfttg1JItG3Ey2D9LR0q40aQLuFeg+BF9lvgSmSkWXhxF7bcIO9VR X-Mailman-Approved-At: Thu, 12 Jul 2012 17:28:05 +1000 Cc: linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, stuart.yoder@freescale.com X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 --- 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 - #include - #include -+#include - #include -+#include - #include - #include - #include -@@ -171,6 +261,9 @@ - return DMA_ERROR_CODE; - } - -+ if (should_fail_iommu(dev)) -+ return DMA_ERROR_CODE; -+ - if (handle && *handle) - start = *handle; - else