[lkml]   [2011]   [May]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Subjectlinux-next: manual merge of the i.MX tree with the tree
    Hi Sascha,

    Today's linux-next merge of the i.MX tree got a conflict in
    arch/arm/mach-imx/Kconfig arch/arm/plat-mxc/Kconfig between the "same"
    commits from the arm tree and the i.MX tree.

    Please don't rearrange commits when upstreaming them - or if you do, then
    update the source tree as well. I am assuming that the commits that are
    in the arm tree amount to the same as what has been int the i.MX tree for
    some time. There are a couple of extra commits in the i.MX tree, so I
    just used the i.MX version of those files. This may not work.
    Stephen Rothwell
    [unhandled content-type:application/pgp-signature]
     \ /
      Last update: 2011-05-23 03:47    [W:0.018 / U:1.668 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site