From mboxrd@z Thu Jan  1 00:00:00 1970
Return-path: <mchehab@pedra>
Received: from proofpoint-cluster.metrocast.net ([65.175.128.136]:44913 "EHLO
	proofpoint-cluster.metrocast.net" rhost-flags-OK-OK-OK-OK)
	by vger.kernel.org with ESMTP id S1753471Ab1AZXdr (ORCPT
	<rfc822;linux-media@vger.kernel.org>);
	Wed, 26 Jan 2011 18:33:47 -0500
Subject: Re: [GIT PULL] More IR fixes for 2.6.38
From: Andy Walls <awalls@md.metrocast.net>
To: Mauro Carvalho Chehab <mchehab@redhat.com>
Cc: Jarod Wilson <jarod@redhat.com>, linux-media@vger.kernel.org
In-Reply-To: <4D405D8E.6020900@redhat.com>
References: <yc7vxnkntxcbxdk5pe3jpndi.1296062052946@email.android.com>
	 <4D405D8E.6020900@redhat.com>
Content-Type: text/plain; charset="UTF-8"
Date: Wed, 26 Jan 2011 18:33:23 -0500
Message-ID: <1296084803.2444.2.camel@localhost>
Mime-Version: 1.0
Content-Transfer-Encoding: 7bit
List-ID: <linux-media.vger.kernel.org>
Sender: <mchehab@pedra>

On Wed, 2011-01-26 at 15:44 -0200, Mauro Carvalho Chehab wrote:

> Andy,
> 
> Then, it is better to use Jarod's tree for it. His patches are against
> upstream, and are meant to be applied to .38. So, I need first to send
> them to linux-next, then to upstream and then merge from upstream,
> otherwise, I'll have to manually fix the conflicts on the next merge window.
> Due to LCA, I'm not sure if Linus will apply much patches during this
> week. So, I'll probably wait until next week to send Jarod's patches
> upstream.

> Jarod Wilson <jarod@redhat.com> wrote:

> >>  git://linuxtv.org/jarod/linux-2.6-ir.git for-2.6.38


OK.  I'll work off of Jarod's branch then.

Thanks.

Regards,
Andy