From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gate.crashing.org (gate.crashing.org [63.228.1.57]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6CF5EB7DF8 for ; Thu, 13 May 2010 11:46:31 +1000 (EST) Subject: [git pull] Please pull powerpc.git merge branch From: Benjamin Herrenschmidt To: Linus Torvalds In-Reply-To: <1273660604.21352.123.camel@pasglop> References: <1273650396.21352.121.camel@pasglop> <1273660604.21352.123.camel@pasglop> Content-Type: text/plain; charset="UTF-8" Date: Thu, 13 May 2010 11:46:21 +1000 Message-ID: <1273715181.21352.157.camel@pasglop> Mime-Version: 1.0 Cc: linuxppc-dev list , Andrew Morton , Linux Kernel list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Hi Linus ! I've added to my merge branch Kumar's swiotlb fix. Here's the updated pull request. Thanks ! Cheers, Ben. The following changes since commit cea0d767c29669bf89f86e4aee46ef462d2ebae8: Linus Torvalds (1): Merge branch 'hwmon-for-linus' of git://git.kernel.org/.../jdelvare/staging are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc.git merge Benjamin Herrenschmidt (1): Merge commit 'kumar/merge' into merge Kumar Gala (1): powerpc/swiotlb: Fix off by one in determining boundary of which ops to use Paul Mackerras (1): powerpc/perf_event: Fix oops due to perf_event_do_pending call arch/powerpc/include/asm/hw_irq.h | 38 ----------------------- arch/powerpc/kernel/asm-offsets.c | 1 - arch/powerpc/kernel/dma-swiotlb.c | 5 ++- arch/powerpc/kernel/entry_64.S | 9 ----- arch/powerpc/kernel/irq.c | 6 ---- arch/powerpc/kernel/time.c | 60 +++++++++++++++++++++++++++++------- 6 files changed, 51 insertions(+), 68 deletions(-)