[lkml]   [2012]   [Jan]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the v4l-dvb tree with the arm-soc tree
    Hi Mauro,

    Today's linux-next merge of the v4l-dvb tree got conflicts in a large
    number of files between commits from the arm-soc tree and commits from the
    v4l-dvb tree. You have rebased the v4l-dvb tree onto v3.2 while the
    arm-soc tree had merged a previous version. you have then added a lot
    more commits on top of the result - which produces all the conflicts. :-(

    This is exactly the sort of pain I alluded to when I first noted that the
    v4l-dvb tree had been merged into the arm-soc tree ...

    Not happy.
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2012-01-11 03:35    [W:0.017 / U:7.256 seconds]
    ©2003-2017 Jasper Spaans. hosted at Digital OceanAdvertise on this site