| Message ID | 20220805232834.4024091-1-luiz.dentz@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | pull request: bluetooth 2022-08-05 | expand |
On Fri, 5 Aug 2022 16:28:34 -0700 Luiz Augusto von Dentz wrote: > The following changes since commit 2e64fe4624d19bc71212aae434c54874e5c49c5a: > > selftests: add few test cases for tap driver (2022-08-05 08:59:15 +0100) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git tags/for-net-2022-08-05 > > for you to fetch changes up to 118862122fcb298548ddadf4a3b6c8511b3345b7: > > Bluetooth: ISO: Fix not using the correct QoS (2022-08-05 16:16:54 -0700) Hi Luiz! Did you end up switching to the no-rebase/pull-back model or are you still rebasing?
Hi Jakub, On Fri, Aug 5, 2022 at 5:47 PM Jakub Kicinski <kuba@kernel.org> wrote: > > On Fri, 5 Aug 2022 16:28:34 -0700 Luiz Augusto von Dentz wrote: > > The following changes since commit 2e64fe4624d19bc71212aae434c54874e5c49c5a: > > > > selftests: add few test cases for tap driver (2022-08-05 08:59:15 +0100) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git tags/for-net-2022-08-05 > > > > for you to fetch changes up to 118862122fcb298548ddadf4a3b6c8511b3345b7: > > > > Bluetooth: ISO: Fix not using the correct QoS (2022-08-05 16:16:54 -0700) > > Hi Luiz! > > Did you end up switching to the no-rebase/pull-back model or are you > still rebasing? Still rebasing, I thought that didn't make any difference as long as the patches apply.
On Mon, 8 Aug 2022 12:38:25 -0700 Luiz Augusto von Dentz wrote: > > Did you end up switching to the no-rebase/pull-back model or are you > > still rebasing? > > Still rebasing, I thought that didn't make any difference as long as > the patches apply. Long term the non-rebasing model is probably better since it'd be great for the bluetooth tree to be included in linux-next. Since you haven't started using that model, tho, would you mind repairing the Fixes tags in this PR? :)
Hi Jakub, On Mon, Aug 8, 2022 at 2:30 PM Jakub Kicinski <kuba@kernel.org> wrote: > > On Mon, 8 Aug 2022 12:38:25 -0700 Luiz Augusto von Dentz wrote: > > > Did you end up switching to the no-rebase/pull-back model or are you > > > still rebasing? > > > > Still rebasing, I thought that didn't make any difference as long as > > the patches apply. > > Long term the non-rebasing model is probably better since it'd be great > for the bluetooth tree to be included in linux-next. You mean that bluetooth-next would be pulled directly into linux-next rather than net-next? > Since you haven't started using that model, tho, would you mind > repairing the Fixes tags in this PR? :) Let me fix them.
On Mon, 8 Aug 2022 14:36:16 -0700 Luiz Augusto von Dentz wrote: > > > Still rebasing, I thought that didn't make any difference as long as > > > the patches apply. > > > > Long term the non-rebasing model is probably better since it'd be great > > for the bluetooth tree to be included in linux-next. > > You mean that bluetooth-next would be pulled directly into linux-next > rather than net-next? No, no. linux-next is just an integration tree, it doesn't take PRs. Some more info: https://www.kernel.org/doc/html/latest/process/howto.html#linux-next-integration-testing-tree It's mostly for checking for conflicts and automated testing. All the compilation bots run on it. > > Since you haven't started using that model, tho, would you mind > > repairing the Fixes tags in this PR? :) > > Let me fix them. Thanks!
Hi Jakub, On Mon, Aug 8, 2022 at 2:36 PM Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > Hi Jakub, > > On Mon, Aug 8, 2022 at 2:30 PM Jakub Kicinski <kuba@kernel.org> wrote: > > > > On Mon, 8 Aug 2022 12:38:25 -0700 Luiz Augusto von Dentz wrote: > > > > Did you end up switching to the no-rebase/pull-back model or are you > > > > still rebasing? > > > > > > Still rebasing, I thought that didn't make any difference as long as > > > the patches apply. > > > > Long term the non-rebasing model is probably better since it'd be great > > for the bluetooth tree to be included in linux-next. > > You mean that bluetooth-next would be pulled directly into linux-next > rather than net-next? > > > Since you haven't started using that model, tho, would you mind > > repairing the Fixes tags in this PR? :) > > Let me fix them. Is there a script or something which can be used to verify the Fix tags? Or you can actually tell me what are the hashes that appear not to be on net. > -- > Luiz Augusto von Dentz
On Mon, 8 Aug 2022 14:51:00 -0700 Luiz Augusto von Dentz wrote: > Is there a script or something which can be used to verify the Fix > tags? Or you can actually tell me what are the hashes that appear not > to be on net. Yes: https://raw.githubusercontent.com/gregkh/gregkh-linux/master/work/verify_fixes.sh
Hi Jakub, On Mon, Aug 8, 2022 at 4:46 PM Jakub Kicinski <kuba@kernel.org> wrote: > > On Mon, 8 Aug 2022 14:51:00 -0700 Luiz Augusto von Dentz wrote: > > Is there a script or something which can be used to verify the Fix > > tags? Or you can actually tell me what are the hashes that appear not > > to be on net. > > Yes: > > https://raw.githubusercontent.com/gregkh/gregkh-linux/master/work/verify_fixes.sh Perfect, looks like I missed 2 but the script find them out: Commit: 4896e034bdd1 ("Bluetooth: ISO: Fix memory corruption") Fixes tag: Fixes: f764a6c2c1e4: ("Bluetooth: ISO: Add broadcast support") Has these problem(s): - missing space between the SHA1 and the subject - Subject does not match target commit subject Just use git log -1 --format='Fixes: %h ("%s")' Commit: 25d6bec1685d ("Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression") Fixes tag: Fixes: d0be8347c623: ("Bluetooth: L2CAP: Fix use-after-free caused by l2cap_chan_put") Has these problem(s): - missing space between the SHA1 and the subject - Subject does not match target commit subject Just use git log -1 --format='Fixes: %h ("%s")' I fixed those and it now comes empty which I guess is what we expect.
The following changes since commit 2e64fe4624d19bc71212aae434c54874e5c49c5a: selftests: add few test cases for tap driver (2022-08-05 08:59:15 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git tags/for-net-2022-08-05 for you to fetch changes up to 118862122fcb298548ddadf4a3b6c8511b3345b7: Bluetooth: ISO: Fix not using the correct QoS (2022-08-05 16:16:54 -0700) ---------------------------------------------------------------- bluetooth pull request for net: - Fixes various issues related to ISO channel/socket support - Fixes issues when building with C=1 - Fix cancel uninitilized work which blocks syzbot to run ---------------------------------------------------------------- Dan Carpenter (1): Bluetooth: ISO: unlock on error path in iso_sock_setsockopt() Luiz Augusto von Dentz (8): Bluetooth: L2CAP: Fix l2cap_global_chan_by_psm regression Bluetooth: hci_conn: Fix updating ISO QoS PHY Bluetooth: ISO: Fix info leak in iso_sock_getsockopt() Bluetooth: ISO: Fix memory corruption Bluetooth: hci_event: Fix build warning with C=1 Bluetooth: MGMT: Fixes build warnings with C=1 Bluetooth: ISO: Fix iso_sock_getsockopt for BT_DEFER_SETUP Bluetooth: ISO: Fix not using the correct QoS Soenke Huster (1): Bluetooth: Fix null pointer deref on unexpected status event Tetsuo Handa (1): Bluetooth: don't try to cancel uninitialized works at mgmt_index_removed() net/bluetooth/aosp.c | 15 ++++++++++++--- net/bluetooth/hci_conn.c | 11 ++--------- net/bluetooth/hci_event.c | 7 +++++-- net/bluetooth/iso.c | 35 +++++++++++++++++++++++------------ net/bluetooth/l2cap_core.c | 13 ++++++------- net/bluetooth/mgmt.c | 7 ++++--- net/bluetooth/msft.c | 15 ++++++++++++--- 7 files changed, 64 insertions(+), 39 deletions(-)