Re: [PATCH 1/8] /proc/net/ entries for bluetooth protocols

From: Andrei Emeltchenko
Date: Tue Jul 10 2012 - 10:04:11 EST


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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/