From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755441AbZFCKDQ (ORCPT ); Wed, 3 Jun 2009 06:03:16 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752107AbZFCKDC (ORCPT ); Wed, 3 Jun 2009 06:03:02 -0400 Received: from h5.dl5rb.org.uk ([81.2.74.5]:44533 "EHLO h5.dl5rb.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751484AbZFCKDB (ORCPT ); Wed, 3 Jun 2009 06:03:01 -0400 Date: Wed, 3 Jun 2009 11:02:15 +0100 From: Ralf Baechle To: Herbert Xu Cc: Matt Mackall , Atsushi Nemoto , linux-mips@linux-mips.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] hwrng: Add TX4939 RNG driver (v2) Message-ID: <20090603100215.GA13250@linux-mips.org> References: <1243954462-18149-1-git-send-email-anemo@mba.ocn.ne.jp> <1243973584.22069.182.camel@calx> <20090603090238.GH23561@linux-mips.org> <20090603092610.GA11258@gondor.apana.org.au> <20090603092927.GA11369@gondor.apana.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20090603092927.GA11369@gondor.apana.org.au> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Jun 03, 2009 at 07:29:27PM +1000, Herbert Xu wrote: > On Wed, Jun 03, 2009 at 07:26:10PM +1000, Herbert Xu wrote: > > On Wed, Jun 03, 2009 at 10:02:38AM +0100, Ralf Baechle wrote: > > > > > Ok, I'll send this to Linus for 2.6.31 then. > > > > Actually I've already added it to my tree since I'm looking after > > the hwrng drivers. > > But if this causes any conflicts for you, then please let me know > and I'll back it out. Ah, I was looking at MAINTAINERS which said Mack who had acked it was handling it. There is no conflict on the drivers/char/hw_random/ part, so I'll drop that one. The platform part in arch/mips/ has to go through the MIPS tree as it depends on another patch. Ralf