From mboxrd@z Thu Jan 1 00:00:00 1970 From: Grant Likely Subject: Re: linux-next: manual merge of the 52xx-and-virtex tree with Linus' tree Date: Tue, 3 May 2011 07:19:34 -0600 Message-ID: References: <20110503114353.30d1f949.sfr@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: QUOTED-PRINTABLE Return-path: Received: from mail-iy0-f174.google.com ([209.85.210.174]:47767 "EHLO mail-iy0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751060Ab1ECNTy convert rfc822-to-8bit (ORCPT ); Tue, 3 May 2011 09:19:54 -0400 In-Reply-To: Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Paul Mundt , Grant Likely , linux-kernel@vger.kernel.org, Heiko Schocher , linux-next@vger.kernel.org On Mon, May 2, 2011 at 11:49 PM, Grant Likely wrote: > > On May 2, 2011 7:43 PM, "Stephen Rothwell" wro= te: >> >> Hi Grant, >> >> Today's linux-next merge of the 52xx-and-virtex tree got a conflict = in >> drivers/video/sm501fb.c between commit e6a049807105 ("video, sm501: = add >> edid and commandline support") from Linus' tree and commit b6c19191c= 13e >> ("video/sm501: add edid and commandline support") from the >> 52xx-and-virtex tree. >> >> These are slightly different versions of the same patch. =A0I used t= he >> version from the 52xx-and-virtex tree (that removed a use of >> __devinitdata). >> >> Also, another between commit 4295f9bf74a8 ("video, sm501: add OF bin= ding >> to support SM501") from Linus' tree and commit 9d83d245a352 >> ("video/sm501: add OF binding to support SM501") from the 52xx-and-v= irtex >> tree. >> >> Again, different versions of the same patch. =A0The former has a who= le hunk >> that appears to fix a memory leak. =A0So I used that. > > Okay, I'll probably drop those patches from my tree then... I'll inve= stigate > tomorrow. Ah, I missed that Paul had picked them up. Dropping from my tree. g.