public inbox for linux-bluetooth@vger.kernel.org
 help / color / mirror / Atom feed
From: Andrei Emeltchenko <andrei.emeltchenko.news@gmail.com>
To: Masatake YAMATO <yamato@redhat.com>
Cc: linux-kernel@vger.kernel.org, linux-bluetooth@vger.kernel.org
Subject: Re: [PATCH 1/8] /proc/net/ entries for bluetooth protocols
Date: Tue, 10 Jul 2012 17:04:02 +0300	[thread overview]
Message-ID: <20120710140400.GA15795@aemeltch-MOBL1> (raw)
In-Reply-To: <20120629.020253.963694178693689545.yamato@redhat.com>

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 

  reply	other threads:[~2012-07-10 14:04 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-14 17:15 [PATCH 1/8] /proc/net/ entries for bluetooth protocols Masatake YAMATO
2012-06-15  8:00 ` Andrei Emeltchenko
2012-06-17  0:26   ` Masatake YAMATO
2012-06-18  8:28     ` Andrei Emeltchenko
2012-06-28 17:02       ` Masatake YAMATO
2012-07-10 14:04         ` Andrei Emeltchenko [this message]
2012-07-11  4:58           ` [PATCH v3 1/8] bluetooth: " Masatake YAMATO
2012-07-11  4:59             ` [PATCH v3 2/8] bluetooth: Added /proc/net/bnep via bt_procfs_init() Masatake YAMATO
2012-07-25  0:20               ` Gustavo Padovan
2012-07-11  5:02             ` [PATCH v3 3/8] bluetooth: Added /proc/net/cmtp " Masatake YAMATO
2012-07-11  5:02             ` [PATCH v3 4/8] bluetooth: Added /proc/net/hci " Masatake YAMATO
2012-07-11  5:03             ` [PATCH v3 5/8] bluetooth: Added /proc/net/hidp " Masatake YAMATO
2012-07-11  5:03             ` [PATCH v3 6/8] bluetooth: Added /proc/net/l2cap " Masatake YAMATO
2012-07-11  8:48               ` Andrei Emeltchenko
2012-07-11  9:19                 ` Masatake YAMATO
2012-07-11  9:49                   ` Andrei Emeltchenko
2012-07-11  5:04             ` [PATCH v3 7/8] bluetooth: Added /proc/net/rfcomm " Masatake YAMATO
2012-07-11  8:49               ` Andrei Emeltchenko
2012-07-11  5:04             ` [PATCH v3 8/8] bluetooth: Added /proc/net/sco " Masatake YAMATO
2012-07-11 11:23             ` [PATCH v3 1/8] bluetooth: /proc/net/ entries for bluetooth protocols Andrei Emeltchenko
2012-07-11 12:19               ` Masatake YAMATO
2012-07-12  7:42                 ` Andrei Emeltchenko
2012-07-16 13:20                   ` [PATCH v4 " Masatake YAMATO
2012-07-25  0:12                     ` Gustavo Padovan
2012-07-25  0:35                       ` Gustavo Padovan
2012-07-25 16:26                         ` [PATCH v5 1/8] Bluetooth: " Masatake YAMATO
2012-07-25 16:27                         ` [PATCH v5 2/8] Bluetooth: Added /proc/net/bnep via bt_procfs_init() Masatake YAMATO
2012-07-25 16:28                         ` [PATCH v5 3/8] Bluetooth: Added /proc/net/cmtp " Masatake YAMATO
2012-07-25 16:28                         ` [PATCH v5 4/8] Bluetooth: Added /proc/net/hci " Masatake YAMATO
2012-07-25 16:29                         ` [PATCH v5 5/8] Bluetooth: Added /proc/net/hidp " Masatake YAMATO
2012-07-25 16:29                         ` [PATCH v5 6/8] Bluetooth: Added /proc/net/l2cap " Masatake YAMATO
2012-07-25 16:29                         ` [PATCH v5 7/8] Bluetooth: Added /proc/net/rfcomm " Masatake YAMATO
2012-07-25 16:30                         ` [PATCH v5 8/8] Added /proc/net/sco " Masatake YAMATO
2012-07-26  4:24                           ` Gustavo Padovan
2012-08-15 15:22                             ` Jan Engelhardt
2012-07-24 13:08             ` [PATCH v3 1/8] bluetooth: /proc/net/ entries for bluetooth protocols Masatake YAMATO
2012-07-24 13:15               ` Andrei Emeltchenko
2012-06-18 10:00   ` [PATCH v2 1/8] " Masatake YAMATO
2012-07-10 14:06     ` Andrei Emeltchenko
2012-06-18 10:00   ` [PATCH v2 2/8] Added /proc/net/bnep via bt_procfs_init() Masatake YAMATO
2012-06-18 10:01   ` [PATCH v2 3/8] Added /proc/net/cmtp " Masatake YAMATO
2012-06-18 10:01   ` [PATCH v2 4/8] Added /proc/net/hci " Masatake YAMATO
2012-06-18 10:03   ` [PATCH v2 5/8] Added /proc/net/hidp " Masatake YAMATO
2012-06-18 10:03   ` [PATCH v2 6/8] Added /proc/net/l2cap " Masatake YAMATO
2012-06-18 10:04   ` [PATCH v2 7/8] Added /proc/net/rfcomm " Masatake YAMATO
2012-06-18 10:04   ` [PATCH v2 8/8] Added /proc/net/sco " Masatake YAMATO

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120710140400.GA15795@aemeltch-MOBL1 \
    --to=andrei.emeltchenko.news@gmail.com \
    --cc=linux-bluetooth@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=yamato@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox