From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754374AbbDRV6y (ORCPT ); Sat, 18 Apr 2015 17:58:54 -0400 Received: from shards.monkeyblade.net ([149.20.54.216]:57157 "EHLO shards.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750930AbbDRV6x (ORCPT ); Sat, 18 Apr 2015 17:58:53 -0400 Date: Sat, 18 Apr 2015 17:58:51 -0400 (EDT) Message-Id: <20150418.175851.1417021646798799609.davem@davemloft.net> To: torvalds@linux-foundation.org CC: akpm@linux-foundation.org, sparclinux@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [GIT] Sparc From: David Miller X-Mailer: Mew version 6.6 on Emacs 24.4 / Mule 6.0 (HANACHIRUSATO) Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.5.12 (shards.monkeyblade.net [149.20.54.216]); Sat, 18 Apr 2015 14:58:52 -0700 (PDT) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Unfortunately, I brown paper bagged the generic iommu pool allocator by applying the wrong revision of the patch series. This reverts the bad one, and puts the right one in. Please pull, thanks a lot! The following changes since commit 04b7fe6a4a231871ef681bc95e08fe66992f7b1f: Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide (2015-04-17 16:36:59 -0400) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git for you to fetch changes up to ccb301862aa51ea7c10c10b440f3e8bbeac5b720: Merge branch 'iommu-generic-allocator' (2015-04-18 12:35:09 -0700) ---------------------------------------------------------------- David S. Miller (2): sparc: Revert generic IOMMU allocator. Merge branch 'iommu-generic-allocator' Sowmini Varadhan (4): Break up monolithic iommu table/lock into finer graularity pools and lock sparc: Make sparc64 use scalable lib/iommu-common.c functions sparc: Make LDC use common iommu poll management functions iommu-common: Fix PARISC compile-time warnings arch/sparc/include/asm/iommu_64.h | 2 +- arch/sparc/kernel/iommu.c | 78 +++++++++++------------------- arch/sparc/kernel/ldc.c | 60 ++++++------------------ arch/sparc/kernel/pci_sun4v.c | 64 ++++++++++--------------- include/linux/iommu-common.h | 38 +++++++-------- lib/iommu-common.c | 190 ++++++++++++++++++++++++++++++++++++++++++++++---------------------------- 6 files changed, 202 insertions(+), 230 deletions(-)