MIME-Version: 1.0
In-Reply-To: <20120210053036.GC2068@kroah.com>
References: <20120210154806.4a81ec53dc24a40cf91a758a@canb.auug.org.au>
	<20120210053036.GC2068@kroah.com>
Date: Tue, 14 Feb 2012 15:31:39 -0600
Message-ID: <CAB-zwWggC696WKszdkFvE+7azu5LtuVK8__SUcjBX3UP4ieV-g@mail.gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with Linus' tree
From: "Ramirez Luna, Omar" <omar.ramirez@ti.com>
To: Greg KH <greg@kroah.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>, linux-next@vger.kernel.org,
        linux-kernel@vger.kernel.org,
        =?ISO-8859-1?Q?V=EDctor_Manuel_J=E1quez?= <vjaquez@igalia.com>
Content-Type: text/plain; charset=ISO-8859-1
Sender: linux-kernel-owner@vger.kernel.org
Content-Length: 1147
Lines: 30

Hi,

On Thu, Feb 9, 2012 at 11:30 PM, Greg KH <greg@kroah.com> wrote:
> On Fri, Feb 10, 2012 at 03:48:06PM +1100, Stephen Rothwell wrote:
>> Hi Greg,
>>
>> Today's linux-next merge of the staging tree got a conflict in
>> drivers/staging/tidspbridge/rmgr/drv_interface.c between commit
>> 5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks") from
>> Linus' tree and commit 518761dba127 ("staging: tidspbridge: remove unused
>> header") from the staging tree.
>>
>> I fixed it up (I think - see below) and can carry the fix as necessary.
>
> Thanks, I'll try to fix this up with a merge tomorrow to get this in
> sync.

5a63177a6967 ("staging: tidspbridge: fix bridge_open memory leaks")
was accidentally reverted with the merge of staging-3.3-rc3 on
staging-next branch, the same patch still applies since the previous
patch touching this code moves it some lines above.

Regards,

Omar
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/