lkml.org 
[lkml]   [2011]   [Aug]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    SubjectRe: linux-next: manual merge of the net tree with the unicore32 tree
    From
    Date
    On Mon, 2011-08-22 at 20:02 -0700, Stephen Rothwell wrote:
    > Hi all,
    >
    > Today's linux-next merge of the net tree got conflicts in
    > drivers/net/Kconfig and drivers/net/Makefile between commit
    > e8787de6fa83
    > ("unicore32: add pkunity-v3 mac/net driver (umal)") from the unicore32
    > tree and the network driver rearrangement from the net tree.
    >
    > I just added the new driver from the unicore32 tree commit into each
    > file
    > (see below).
    > --
    > Cheers,
    > Stephen Rothwell sfr@canb.auug.org.au

    Hmm, well with the latest series of patches I sent out, I am pretty sure
    this patch would not apply.

    Is it best that this patch not be sent to netdev for driver
    inclusion? :)
    [unhandled content-type:application/pgp-signature]
    \
     
     \ /
      Last update: 2011-08-23 11:03    [W:6.556 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site