[lkml]   [2012]   [Feb]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    SubjectRe: linux-next: manual merge of the staging tree with Linus' tree
    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, this should now be resolved in your next pull of my staging

    greg k-h

     \ /
      Last update: 2012-02-10 20:03    [W:0.025 / U:14.964 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site