lkml.org 
[lkml]   [2012]   [Feb]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    SubjectRe: linux-next: manual merge of the staging tree with Linus' tree
    From
    On Tue, Feb 14, 2012 at 4:37 PM, Greg KH <greg@kroah.com> wrote:
    > On Tue, Feb 14, 2012 at 03:31:39PM -0600, Ramirez Luna, Omar wrote:
    >> 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.
    >
    > Ok, so what should I do here?  What patch should I apply to the
    > staging-next tree?  Just reapply 5a63177a6967?

    Yes, reapplying 5a63177a6967 worked for me.

    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/

    \
     
     \ /
      Last update: 2012-02-15 00:37    [W:0.022 / U:0.916 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site