* [PATCH] Remove dup VCard2.1 SDP format for OPP @ 2010-08-20 12:34 Tom Counihan 2010-08-20 12:59 ` Johan Hedberg 0 siblings, 1 reply; 5+ messages in thread From: Tom Counihan @ 2010-08-20 12:34 UTC (permalink / raw) To: linux-bluetooth OPP SDP record appears to have a duplicate entry for Supported Formats List. --- plugins/opp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/plugins/opp.c b/plugins/opp.c index cd46464..05f944f 100644 --- a/plugins/opp.c +++ b/plugins/opp.c @@ -83,7 +83,6 @@ <attribute id=\"0x0303\"> \ <sequence> \ <uint8 value=\"0x01\"/> \ - <uint8 value=\"0x01\"/> \ <uint8 value=\"0x02\"/> \ <uint8 value=\"0x03\"/> \ <uint8 value=\"0x04\"/> \ -- 1.7.1.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Remove dup VCard2.1 SDP format for OPP 2010-08-20 12:34 [PATCH] Remove dup VCard2.1 SDP format for OPP Tom Counihan @ 2010-08-20 12:59 ` Johan Hedberg 2010-08-20 13:32 ` Tom Counihan 0 siblings, 1 reply; 5+ messages in thread From: Johan Hedberg @ 2010-08-20 12:59 UTC (permalink / raw) To: Tom Counihan; +Cc: linux-bluetooth Hi Tom, On Fri, Aug 20, 2010, Tom Counihan wrote: > OPP SDP record appears to have a duplicate > entry for Supported Formats List. > > --- > plugins/opp.c | 1 - > 1 files changed, 0 insertions(+), 1 deletions(-) The patch looks fine but doesn't apply against latest git: error: patch failed: plugins/opp.c:83 error: plugins/opp.c: patch does not apply Patch failed at 0001 Remove dup VCard2.1 SDP format for OPP Could you make sure that it applies cleanly to latest git and then resend? Thanks. Johan ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Remove dup VCard2.1 SDP format for OPP 2010-08-20 12:59 ` Johan Hedberg @ 2010-08-20 13:32 ` Tom Counihan 2010-08-20 13:39 ` Tom Counihan 0 siblings, 1 reply; 5+ messages in thread From: Tom Counihan @ 2010-08-20 13:32 UTC (permalink / raw) To: Tom Counihan, linux-bluetooth On Fri, Aug 20, 2010 at 1:59 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote: > Hi Tom, > > On Fri, Aug 20, 2010, Tom Counihan wrote: >> OPP SDP record appears to have a duplicate >> entry for Supported Formats List. >> >> --- >> plugins/opp.c | 1 - >> 1 files changed, 0 insertions(+), 1 deletions(-) > > The patch looks fine but doesn't apply against latest git: > > error: patch failed: plugins/opp.c:83 > error: plugins/opp.c: patch does not apply > Patch failed at 0001 Remove dup VCard2.1 SDP format for OPP > > Could you make sure that it applies cleanly to latest git and then > resend? Thanks. I'll send again - I'm assuming that the cause here is we had a race condition between inbound patches? > > Johan > ^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Remove dup VCard2.1 SDP format for OPP 2010-08-20 13:32 ` Tom Counihan @ 2010-08-20 13:39 ` Tom Counihan 2010-08-20 15:58 ` Johan Hedberg 0 siblings, 1 reply; 5+ messages in thread From: Tom Counihan @ 2010-08-20 13:39 UTC (permalink / raw) To: Tom Counihan, linux-bluetooth [-- Attachment #1: Type: text/plain, Size: 973 bytes --] Hi Johan, Attaching patch as an attachment - hopefully all should be fine now. Warm Regards Tom. On Fri, Aug 20, 2010 at 2:32 PM, Tom Counihan <tomcounihan@googlemail.com> wrote: > On Fri, Aug 20, 2010 at 1:59 PM, Johan Hedberg <johan.hedberg@gmail.com> wrote: >> Hi Tom, >> >> On Fri, Aug 20, 2010, Tom Counihan wrote: >>> OPP SDP record appears to have a duplicate >>> entry for Supported Formats List. >>> >>> --- >>> plugins/opp.c | 1 - >>> 1 files changed, 0 insertions(+), 1 deletions(-) >> >> The patch looks fine but doesn't apply against latest git: >> >> error: patch failed: plugins/opp.c:83 >> error: plugins/opp.c: patch does not apply >> Patch failed at 0001 Remove dup VCard2.1 SDP format for OPP >> >> Could you make sure that it applies cleanly to latest git and then >> resend? Thanks. > > I'll send again - I'm assuming that the cause here is we had a race > condition between inbound patches? >> >> Johan >> > [-- Attachment #2: 0001-Remove-dup-VCard2.1-SDP-format-for-OPP.patch --] [-- Type: application/octet-stream, Size: 758 bytes --] From ab7d7fbf60a016b491200f4c5eaf100188dd5d7b Mon Sep 17 00:00:00 2001 From: Tom Counihan <tomcounihan@googlemail.com> Date: Fri, 20 Aug 2010 14:20:53 +0100 Subject: [PATCH] Remove dup VCard2.1 SDP format for OPP OPP SDP record appears to have a duplicate entry for Supported Formats List. --- plugins/opp.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/plugins/opp.c b/plugins/opp.c index cd46464..05f944f 100644 --- a/plugins/opp.c +++ b/plugins/opp.c @@ -83,7 +83,6 @@ <attribute id=\"0x0303\"> \ <sequence> \ <uint8 value=\"0x01\"/> \ - <uint8 value=\"0x01\"/> \ <uint8 value=\"0x02\"/> \ <uint8 value=\"0x03\"/> \ <uint8 value=\"0x04\"/> \ -- 1.7.1.1 ^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Remove dup VCard2.1 SDP format for OPP 2010-08-20 13:39 ` Tom Counihan @ 2010-08-20 15:58 ` Johan Hedberg 0 siblings, 0 replies; 5+ messages in thread From: Johan Hedberg @ 2010-08-20 15:58 UTC (permalink / raw) To: Tom Counihan; +Cc: linux-bluetooth Hi Tom, On Fri, Aug 20, 2010, Tom Counihan wrote: > Attaching patch as an attachment - hopefully all should be fine now. Yes, it was fine. The patch is now upstream. Thanks. Johan ^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2010-08-20 15:58 UTC | newest] Thread overview: 5+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2010-08-20 12:34 [PATCH] Remove dup VCard2.1 SDP format for OPP Tom Counihan 2010-08-20 12:59 ` Johan Hedberg 2010-08-20 13:32 ` Tom Counihan 2010-08-20 13:39 ` Tom Counihan 2010-08-20 15:58 ` Johan Hedberg
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox