All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
@ 2021-09-30  8:22 Nicholas Flintham
  2021-10-01  9:40 ` Marcel Holtmann
  0 siblings, 1 reply; 11+ messages in thread
From: Nicholas Flintham @ 2021-09-30  8:22 UTC (permalink / raw)
  To: linux-kernel; +Cc: linux-bluetooth, Nicholas Flintham

Add support for TP-Link UB500 Adapter (RTL8761B)

* /sys/kernel/debug/usb/devices
T:  Bus=01 Lev=02 Prnt=05 Port=01 Cnt=01 Dev#= 78 Spd=12   MxCh= 0
D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
P:  Vendor=2357 ProdID=0604 Rev= 2.00
S:  Manufacturer=
S:  Product=TP-Link UB500 Adapter
S:  SerialNumber=E848B8C82000
C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA
I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms

Signed-off-by: Nicholas Flintham <nick@flinny.org>
---
 drivers/bluetooth/btusb.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index 60d2fce59a71..79d0db542da3 100644
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -433,6 +433,10 @@ static const struct usb_device_id blacklist_table[] = {
 	{ USB_DEVICE(0x0bda, 0xb009), .driver_info = BTUSB_REALTEK },
 	{ USB_DEVICE(0x2ff8, 0xb011), .driver_info = BTUSB_REALTEK },
 
+	/* Additional Realtek 8761B Bluetooth devices */
+	{ USB_DEVICE(0x2357, 0x0604), .driver_info = BTUSB_REALTEK |
+						     BTUSB_WIDEBAND_SPEECH },
+
 	/* Additional Realtek 8761BU Bluetooth devices */
 	{ USB_DEVICE(0x0b05, 0x190e), .driver_info = BTUSB_REALTEK |
 	  					     BTUSB_WIDEBAND_SPEECH },
-- 
2.32.0


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
  2021-09-30  8:22 Nicholas Flintham
@ 2021-10-01  9:40 ` Marcel Holtmann
  0 siblings, 0 replies; 11+ messages in thread
From: Marcel Holtmann @ 2021-10-01  9:40 UTC (permalink / raw)
  To: Nicholas Flintham; +Cc: linux-kernel, linux-bluetooth

Hi Nicholas,

> Add support for TP-Link UB500 Adapter (RTL8761B)
> 
> * /sys/kernel/debug/usb/devices
> T:  Bus=01 Lev=02 Prnt=05 Port=01 Cnt=01 Dev#= 78 Spd=12   MxCh= 0
> D:  Ver= 1.10 Cls=e0(wlcon) Sub=01 Prot=01 MxPS=64 #Cfgs=  1
> P:  Vendor=2357 ProdID=0604 Rev= 2.00
> S:  Manufacturer=
> S:  Product=TP-Link UB500 Adapter
> S:  SerialNumber=E848B8C82000
> C:* #Ifs= 2 Cfg#= 1 Atr=e0 MxPwr=500mA
> I:* If#= 0 Alt= 0 #EPs= 3 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
> E:  Ad=81(I) Atr=03(Int.) MxPS=  16 Ivl=1ms
> E:  Ad=02(O) Atr=02(Bulk) MxPS=  64 Ivl=0ms
> E:  Ad=82(I) Atr=02(Bulk) MxPS=  64 Ivl=0ms
> I:* If#= 1 Alt= 0 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
> E:  Ad=03(O) Atr=01(Isoc) MxPS=   0 Ivl=1ms
> E:  Ad=83(I) Atr=01(Isoc) MxPS=   0 Ivl=1ms
> I:  If#= 1 Alt= 1 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
> E:  Ad=03(O) Atr=01(Isoc) MxPS=   9 Ivl=1ms
> E:  Ad=83(I) Atr=01(Isoc) MxPS=   9 Ivl=1ms
> I:  If#= 1 Alt= 2 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
> E:  Ad=03(O) Atr=01(Isoc) MxPS=  17 Ivl=1ms
> E:  Ad=83(I) Atr=01(Isoc) MxPS=  17 Ivl=1ms
> I:  If#= 1 Alt= 3 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
> E:  Ad=03(O) Atr=01(Isoc) MxPS=  25 Ivl=1ms
> E:  Ad=83(I) Atr=01(Isoc) MxPS=  25 Ivl=1ms
> I:  If#= 1 Alt= 4 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
> E:  Ad=03(O) Atr=01(Isoc) MxPS=  33 Ivl=1ms
> E:  Ad=83(I) Atr=01(Isoc) MxPS=  33 Ivl=1ms
> I:  If#= 1 Alt= 5 #EPs= 2 Cls=e0(wlcon) Sub=01 Prot=01 Driver=btusb
> E:  Ad=03(O) Atr=01(Isoc) MxPS=  49 Ivl=1ms
> E:  Ad=83(I) Atr=01(Isoc) MxPS=  49 Ivl=1ms
> 
> Signed-off-by: Nicholas Flintham <nick@flinny.org>
> ---
> drivers/bluetooth/btusb.c | 4 ++++
> 1 file changed, 4 insertions(+)

patch has been applied to bluetooth-next tree.

Regards

Marcel


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
@ 2021-10-10 20:59 Marek Vasut
  2021-10-11  7:44 ` Greg Kroah-Hartman
  0 siblings, 1 reply; 11+ messages in thread
From: Marek Vasut @ 2021-10-10 20:59 UTC (permalink / raw)
  To: Sasha Levin, linux-stable, Greg Kroah-Hartman

Hello everyone,

The following new device USB ID has landed in linux-next recently:

4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")

It would be nice if it could be backported to stable. I verified it 
works on 5.14.y as a simple cherry-pick .

Thank you

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
  2021-10-10 20:59 [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter Marek Vasut
@ 2021-10-11  7:44 ` Greg Kroah-Hartman
  2021-11-16 17:41   ` Szabolcs Sipos
  0 siblings, 1 reply; 11+ messages in thread
From: Greg Kroah-Hartman @ 2021-10-11  7:44 UTC (permalink / raw)
  To: Marek Vasut; +Cc: Sasha Levin, linux-stable

On Sun, Oct 10, 2021 at 10:59:06PM +0200, Marek Vasut wrote:
> Hello everyone,
> 
> The following new device USB ID has landed in linux-next recently:
> 
> 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
> 
> It would be nice if it could be backported to stable. I verified it works on
> 5.14.y as a simple cherry-pick .

A patch needs to be in Linus's tree before we can add it to the stable
releases.  Please let us know when it gets there and we will be glad to
pick it up.

thanks,

greg k-h

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
  2021-10-11  7:44 ` Greg Kroah-Hartman
@ 2021-11-16 17:41   ` Szabolcs Sipos
  2021-11-16 18:35     ` Greg Kroah-Hartman
  0 siblings, 1 reply; 11+ messages in thread
From: Szabolcs Sipos @ 2021-11-16 17:41 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: Sasha Levin, linux-stable, Marek Vasut

On 10/11/21 09:44, Greg Kroah-Hartman wrote:
> On Sun, Oct 10, 2021 at 10:59:06PM +0200, Marek Vasut wrote:
>> Hello everyone,
>>
>> The following new device USB ID has landed in linux-next recently:
>>
>> 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
>>
>> It would be nice if it could be backported to stable. I verified it works on
>> 5.14.y as a simple cherry-pick .
> 
> A patch needs to be in Linus's tree before we can add it to the stable
> releases.  Please let us know when it gets there and we will be glad to
> pick it up.
> 
> thanks,
> 
> greg k-h

Hello Greg,

The patch has reached Linus's tree:
4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")

Could you please add it to stable (5.15.y)?

Thanks,
Szabolcs


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
  2021-11-16 17:41   ` Szabolcs Sipos
@ 2021-11-16 18:35     ` Greg Kroah-Hartman
  2021-11-16 19:58       ` Marek Vasut
  0 siblings, 1 reply; 11+ messages in thread
From: Greg Kroah-Hartman @ 2021-11-16 18:35 UTC (permalink / raw)
  To: Szabolcs Sipos; +Cc: Sasha Levin, linux-stable, Marek Vasut

On Tue, Nov 16, 2021 at 06:41:08PM +0100, Szabolcs Sipos wrote:
> On 10/11/21 09:44, Greg Kroah-Hartman wrote:
> > On Sun, Oct 10, 2021 at 10:59:06PM +0200, Marek Vasut wrote:
> > > Hello everyone,
> > > 
> > > The following new device USB ID has landed in linux-next recently:
> > > 
> > > 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
> > > 
> > > It would be nice if it could be backported to stable. I verified it works on
> > > 5.14.y as a simple cherry-pick .
> > 
> > A patch needs to be in Linus's tree before we can add it to the stable
> > releases.  Please let us know when it gets there and we will be glad to
> > pick it up.
> > 
> > thanks,
> > 
> > greg k-h
> 
> Hello Greg,
> 
> The patch has reached Linus's tree:
> 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
> 
> Could you please add it to stable (5.15.y)?

I will queue it up for the next set of kernels after the current ones are
released.

thansk,

greg k-h

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
  2021-11-16 18:35     ` Greg Kroah-Hartman
@ 2021-11-16 19:58       ` Marek Vasut
  2021-11-17  6:35         ` Greg Kroah-Hartman
  0 siblings, 1 reply; 11+ messages in thread
From: Marek Vasut @ 2021-11-16 19:58 UTC (permalink / raw)
  To: Greg Kroah-Hartman, Szabolcs Sipos; +Cc: Sasha Levin, linux-stable

On 11/16/21 7:35 PM, Greg Kroah-Hartman wrote:
> On Tue, Nov 16, 2021 at 06:41:08PM +0100, Szabolcs Sipos wrote:
>> On 10/11/21 09:44, Greg Kroah-Hartman wrote:
>>> On Sun, Oct 10, 2021 at 10:59:06PM +0200, Marek Vasut wrote:
>>>> Hello everyone,
>>>>
>>>> The following new device USB ID has landed in linux-next recently:
>>>>
>>>> 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
>>>>
>>>> It would be nice if it could be backported to stable. I verified it works on
>>>> 5.14.y as a simple cherry-pick .
>>>
>>> A patch needs to be in Linus's tree before we can add it to the stable
>>> releases.  Please let us know when it gets there and we will be glad to
>>> pick it up.
>>>
>>> thanks,
>>>
>>> greg k-h
>>
>> Hello Greg,
>>
>> The patch has reached Linus's tree:
>> 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
>>
>> Could you please add it to stable (5.15.y)?
> 
> I will queue it up for the next set of kernels after the current ones are
> released.

btw while you're bringing it up, is there some sure-fire method I can 
use to verify the patch is in Linus tree, besides having a separate 
checkout of that tree ?

I usually have both Linus tree as origin and next in one git tree, so I 
was wondering if there is a recommended way to avoid mistakes like the 
one I made above (and checking at git.kernel.org apparently also has its 
downsides).

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
  2021-11-16 19:58       ` Marek Vasut
@ 2021-11-17  6:35         ` Greg Kroah-Hartman
  2021-11-17 20:27           ` Marek Vasut
  0 siblings, 1 reply; 11+ messages in thread
From: Greg Kroah-Hartman @ 2021-11-17  6:35 UTC (permalink / raw)
  To: Marek Vasut; +Cc: Szabolcs Sipos, Sasha Levin, linux-stable

On Tue, Nov 16, 2021 at 08:58:15PM +0100, Marek Vasut wrote:
> On 11/16/21 7:35 PM, Greg Kroah-Hartman wrote:
> > On Tue, Nov 16, 2021 at 06:41:08PM +0100, Szabolcs Sipos wrote:
> > > On 10/11/21 09:44, Greg Kroah-Hartman wrote:
> > > > On Sun, Oct 10, 2021 at 10:59:06PM +0200, Marek Vasut wrote:
> > > > > Hello everyone,
> > > > > 
> > > > > The following new device USB ID has landed in linux-next recently:
> > > > > 
> > > > > 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
> > > > > 
> > > > > It would be nice if it could be backported to stable. I verified it works on
> > > > > 5.14.y as a simple cherry-pick .
> > > > 
> > > > A patch needs to be in Linus's tree before we can add it to the stable
> > > > releases.  Please let us know when it gets there and we will be glad to
> > > > pick it up.
> > > > 
> > > > thanks,
> > > > 
> > > > greg k-h
> > > 
> > > Hello Greg,
> > > 
> > > The patch has reached Linus's tree:
> > > 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
> > > 
> > > Could you please add it to stable (5.15.y)?
> > 
> > I will queue it up for the next set of kernels after the current ones are
> > released.
> 
> btw while you're bringing it up, is there some sure-fire method I can use to
> verify the patch is in Linus tree, besides having a separate checkout of
> that tree ?

Without the tree/branch checked out?  Not that I know of, sorry.

> I usually have both Linus tree as origin and next in one git tree, so I was
> wondering if there is a recommended way to avoid mistakes like the one I
> made above (and checking at git.kernel.org apparently also has its
> downsides).

Having both in one git tree is fine.  Just switch between branches (one
that tracks Linus's and one that tracks linux-next) and you can see what
is happening in each of them.

There's other "tricks" to see if patches have been added to branches by
adding them to a branch and then rebasing and seeing the end result, but
those get tricky to try to explain in simple emails...

greg k-h

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
  2021-11-17  6:35         ` Greg Kroah-Hartman
@ 2021-11-17 20:27           ` Marek Vasut
  2021-11-18  8:23             ` Greg Kroah-Hartman
  0 siblings, 1 reply; 11+ messages in thread
From: Marek Vasut @ 2021-11-17 20:27 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: Szabolcs Sipos, Sasha Levin, linux-stable

On 11/17/21 7:35 AM, Greg Kroah-Hartman wrote:
> On Tue, Nov 16, 2021 at 08:58:15PM +0100, Marek Vasut wrote:
>> On 11/16/21 7:35 PM, Greg Kroah-Hartman wrote:
>>> On Tue, Nov 16, 2021 at 06:41:08PM +0100, Szabolcs Sipos wrote:
>>>> On 10/11/21 09:44, Greg Kroah-Hartman wrote:
>>>>> On Sun, Oct 10, 2021 at 10:59:06PM +0200, Marek Vasut wrote:
>>>>>> Hello everyone,
>>>>>>
>>>>>> The following new device USB ID has landed in linux-next recently:
>>>>>>
>>>>>> 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
>>>>>>
>>>>>> It would be nice if it could be backported to stable. I verified it works on
>>>>>> 5.14.y as a simple cherry-pick .
>>>>>
>>>>> A patch needs to be in Linus's tree before we can add it to the stable
>>>>> releases.  Please let us know when it gets there and we will be glad to
>>>>> pick it up.
>>>>>
>>>>> thanks,
>>>>>
>>>>> greg k-h
>>>>
>>>> Hello Greg,
>>>>
>>>> The patch has reached Linus's tree:
>>>> 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
>>>>
>>>> Could you please add it to stable (5.15.y)?
>>>
>>> I will queue it up for the next set of kernels after the current ones are
>>> released.
>>
>> btw while you're bringing it up, is there some sure-fire method I can use to
>> verify the patch is in Linus tree, besides having a separate checkout of
>> that tree ?
> 
> Without the tree/branch checked out?  Not that I know of, sorry.

I have a local checkout of Linus tree, except I also have other remotes 
in it, that's what I meant.

>> I usually have both Linus tree as origin and next in one git tree, so I was
>> wondering if there is a recommended way to avoid mistakes like the one I
>> made above (and checking at git.kernel.org apparently also has its
>> downsides).
> 
> Having both in one git tree is fine.  Just switch between branches (one
> that tracks Linus's and one that tracks linux-next) and you can see what
> is happening in each of them.

I can do some "git log linus/master | grep the-commit" , but that does 
not seem to be the most efficient approach, or is it ?

> There's other "tricks" to see if patches have been added to branches by
> adding them to a branch and then rebasing and seeing the end result, but
> those get tricky to try to explain in simple emails...

Some sort of git-cherry-pick and git-rebase ?

All right

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
  2021-11-17 20:27           ` Marek Vasut
@ 2021-11-18  8:23             ` Greg Kroah-Hartman
  2021-11-18 10:19               ` Marek Vasut
  0 siblings, 1 reply; 11+ messages in thread
From: Greg Kroah-Hartman @ 2021-11-18  8:23 UTC (permalink / raw)
  To: Marek Vasut; +Cc: Szabolcs Sipos, Sasha Levin, linux-stable

On Wed, Nov 17, 2021 at 09:27:17PM +0100, Marek Vasut wrote:
> On 11/17/21 7:35 AM, Greg Kroah-Hartman wrote:
> > On Tue, Nov 16, 2021 at 08:58:15PM +0100, Marek Vasut wrote:
> > > On 11/16/21 7:35 PM, Greg Kroah-Hartman wrote:
> > > > On Tue, Nov 16, 2021 at 06:41:08PM +0100, Szabolcs Sipos wrote:
> > > > > On 10/11/21 09:44, Greg Kroah-Hartman wrote:
> > > > > > On Sun, Oct 10, 2021 at 10:59:06PM +0200, Marek Vasut wrote:
> > > > > > > Hello everyone,
> > > > > > > 
> > > > > > > The following new device USB ID has landed in linux-next recently:
> > > > > > > 
> > > > > > > 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
> > > > > > > 
> > > > > > > It would be nice if it could be backported to stable. I verified it works on
> > > > > > > 5.14.y as a simple cherry-pick .
> > > > > > 
> > > > > > A patch needs to be in Linus's tree before we can add it to the stable
> > > > > > releases.  Please let us know when it gets there and we will be glad to
> > > > > > pick it up.
> > > > > > 
> > > > > > thanks,
> > > > > > 
> > > > > > greg k-h
> > > > > 
> > > > > Hello Greg,
> > > > > 
> > > > > The patch has reached Linus's tree:
> > > > > 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
> > > > > 
> > > > > Could you please add it to stable (5.15.y)?
> > > > 
> > > > I will queue it up for the next set of kernels after the current ones are
> > > > released.
> > > 
> > > btw while you're bringing it up, is there some sure-fire method I can use to
> > > verify the patch is in Linus tree, besides having a separate checkout of
> > > that tree ?
> > 
> > Without the tree/branch checked out?  Not that I know of, sorry.
> 
> I have a local checkout of Linus tree, except I also have other remotes in
> it, that's what I meant.
> 
> > > I usually have both Linus tree as origin and next in one git tree, so I was
> > > wondering if there is a recommended way to avoid mistakes like the one I
> > > made above (and checking at git.kernel.org apparently also has its
> > > downsides).
> > 
> > Having both in one git tree is fine.  Just switch between branches (one
> > that tracks Linus's and one that tracks linux-next) and you can see what
> > is happening in each of them.
> 
> I can do some "git log linus/master | grep the-commit" , but that does not
> seem to be the most efficient approach, or is it ?

git log linux/master path/to/file/you/care/about.c

will give you just the log of the specific file as you know what one you
are looking for here, right?

> > There's other "tricks" to see if patches have been added to branches by
> > adding them to a branch and then rebasing and seeing the end result, but
> > those get tricky to try to explain in simple emails...
> 
> Some sort of git-cherry-pick and git-rebase ?

Yes, create a branch:
	git checkout -b my_new_branch linux/master
add the patch
	git cherry-pick SHA_to_pick

And then later on after you have updated linux/master:
	git rebase linux/master
and see if anything is still left here or not:
	git log linux/master..HEAD

if the commit is merged, then the log will be empty.

have fun!

greg k-h

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter
  2021-11-18  8:23             ` Greg Kroah-Hartman
@ 2021-11-18 10:19               ` Marek Vasut
  0 siblings, 0 replies; 11+ messages in thread
From: Marek Vasut @ 2021-11-18 10:19 UTC (permalink / raw)
  To: Greg Kroah-Hartman; +Cc: Szabolcs Sipos, Sasha Levin, linux-stable

On 11/18/21 9:23 AM, Greg Kroah-Hartman wrote:
> On Wed, Nov 17, 2021 at 09:27:17PM +0100, Marek Vasut wrote:
>> On 11/17/21 7:35 AM, Greg Kroah-Hartman wrote:
>>> On Tue, Nov 16, 2021 at 08:58:15PM +0100, Marek Vasut wrote:
>>>> On 11/16/21 7:35 PM, Greg Kroah-Hartman wrote:
>>>>> On Tue, Nov 16, 2021 at 06:41:08PM +0100, Szabolcs Sipos wrote:
>>>>>> On 10/11/21 09:44, Greg Kroah-Hartman wrote:
>>>>>>> On Sun, Oct 10, 2021 at 10:59:06PM +0200, Marek Vasut wrote:
>>>>>>>> Hello everyone,
>>>>>>>>
>>>>>>>> The following new device USB ID has landed in linux-next recently:
>>>>>>>>
>>>>>>>> 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
>>>>>>>>
>>>>>>>> It would be nice if it could be backported to stable. I verified it works on
>>>>>>>> 5.14.y as a simple cherry-pick .
>>>>>>>
>>>>>>> A patch needs to be in Linus's tree before we can add it to the stable
>>>>>>> releases.  Please let us know when it gets there and we will be glad to
>>>>>>> pick it up.
>>>>>>>
>>>>>>> thanks,
>>>>>>>
>>>>>>> greg k-h
>>>>>>
>>>>>> Hello Greg,
>>>>>>
>>>>>> The patch has reached Linus's tree:
>>>>>> 4fd6d4907961 ("Bluetooth: btusb: Add support for TP-Link UB500 Adapter")
>>>>>>
>>>>>> Could you please add it to stable (5.15.y)?
>>>>>
>>>>> I will queue it up for the next set of kernels after the current ones are
>>>>> released.
>>>>
>>>> btw while you're bringing it up, is there some sure-fire method I can use to
>>>> verify the patch is in Linus tree, besides having a separate checkout of
>>>> that tree ?
>>>
>>> Without the tree/branch checked out?  Not that I know of, sorry.
>>
>> I have a local checkout of Linus tree, except I also have other remotes in
>> it, that's what I meant.
>>
>>>> I usually have both Linus tree as origin and next in one git tree, so I was
>>>> wondering if there is a recommended way to avoid mistakes like the one I
>>>> made above (and checking at git.kernel.org apparently also has its
>>>> downsides).
>>>
>>> Having both in one git tree is fine.  Just switch between branches (one
>>> that tracks Linus's and one that tracks linux-next) and you can see what
>>> is happening in each of them.
>>
>> I can do some "git log linus/master | grep the-commit" , but that does not
>> seem to be the most efficient approach, or is it ?
> 
> git log linux/master path/to/file/you/care/about.c
> 
> will give you just the log of the specific file as you know what one you
> are looking for here, right?
> 
>>> There's other "tricks" to see if patches have been added to branches by
>>> adding them to a branch and then rebasing and seeing the end result, but
>>> those get tricky to try to explain in simple emails...
>>
>> Some sort of git-cherry-pick and git-rebase ?
> 
> Yes, create a branch:
> 	git checkout -b my_new_branch linux/master
> add the patch
> 	git cherry-pick SHA_to_pick
> 
> And then later on after you have updated linux/master:
> 	git rebase linux/master
> and see if anything is still left here or not:
> 	git log linux/master..HEAD
> 
> if the commit is merged, then the log will be empty.

Thanks

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2021-11-18 10:21 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-10 20:59 [PATCH] Bluetooth: btusb: Add support for TP-Link UB500 Adapter Marek Vasut
2021-10-11  7:44 ` Greg Kroah-Hartman
2021-11-16 17:41   ` Szabolcs Sipos
2021-11-16 18:35     ` Greg Kroah-Hartman
2021-11-16 19:58       ` Marek Vasut
2021-11-17  6:35         ` Greg Kroah-Hartman
2021-11-17 20:27           ` Marek Vasut
2021-11-18  8:23             ` Greg Kroah-Hartman
2021-11-18 10:19               ` Marek Vasut
  -- strict thread matches above, loose matches on Subject: below --
2021-09-30  8:22 Nicholas Flintham
2021-10-01  9:40 ` Marcel Holtmann

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.