lkml.org 
[lkml]   [2012]   [Jul]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    Date
    From
    SubjectRe: [PATCH 1/8] /proc/net/ entries for bluetooth protocols
    Hi Masatake,

    On Fri, Jun 29, 2012 at 02:02:53AM +0900, Masatake YAMATO wrote:
    > Hi, Andrei
    >
    > Could you review my v2 patch set I submitted?

    It does not apply, trailing white spaces and it also seems that they are
    based on different repository. Please rebase against bluetooth-next.

    Applying: /proc/net/ entries for bluetooth protocols
    bluetooth-next-orig.git/.git/rebase-apply/patch:33:
    trailing whitespace.
    extern int bt_procfs_init(struct module* module, struct net *net, const
    char *name,
    bluetooth-next-orig.git/.git/rebase-apply/patch:140:
    trailing whitespace.

    bluetooth-next-orig.git/.git/rebase-apply/patch:157:
    trailing whitespace.

    bluetooth-next-orig.git/.git/rebase-apply/patch:163:
    trailing whitespace.

    error: patch failed: include/net/bluetooth/bluetooth.h:30
    error: include/net/bluetooth/bluetooth.h: patch does not apply
    Patch failed at 0001 /proc/net/ entries for bluetooth protocols
    When you have resolved this problem run "git am --resolved".
    If you would prefer to skip this patch, instead run "git am --skip".
    To restore the original branch and stop patching run "git am --abort".

    >
    > https://lkml.org/lkml/2012/6/18/170
    >
    > Masatake YAMATO

    Best regards
    Andrei Emeltchenko


    \
     
     \ /
      Last update: 2012-07-10 16:41    [W:0.024 / U:0.316 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site