usb_kdb: only process events successfully received
Subsystems (5)
PATCH v5 1/5 usb_kdb: only process events successfully received
Causes unbound key repeat on error otherwise.
---
v2: fix indentation
v4: fix ! condition to >= 0
v5: fix commit message typo
--- common/usb_kbd.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
common/usb_kbd.c +3 -4
@@ -340,10 +340,9 @@ static inline void usb_kbd_poll_for_event(struct usb_device *dev)struct usb_kbd_pdata *data = dev->privptr;/* Submit a interrupt transfer request */ -usb_submit_int_msg (dev, data->intpipe, &data->new[0 ], data->intpktsize, - data->intinterval); - -usb_kbd_irq_worker (dev); +if (usb_submit_int_msg (dev, data->intpipe, &data->new[0 ], + data->intpktsize, data->intinterval) >=0 ) +usb_kbd_irq_worker (dev);#elif defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP ) || \ defined(CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE )#if defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP )
Signature · 1 line
2.22.0
PATCH v5 2/5 usb: usb_submit_int_msg -> usb_int_msg
This aligns naming with usb_bulk_msg and usb_control_msg.
---
v2: new patch
v4: fix indentation of function arguments
--- common/usb.c | 4 ++-- common/usb_kbd.c | 8 ++++---- include/usb.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-)
common/usb.c +2 -2
@@ -194,8 +194,8 @@ int usb_disable_asynch(int disable)/* * submits an Interrupt Message */ -int usb_submit_int_msg (struct usb_device *dev,unsigned long pipe, -void *buffer,int transfer_len,int interval) +int usb_int_msg (struct usb_device *dev,unsigned long pipe, +void *buffer,int transfer_len,int interval) {return submit_int_msg (dev, pipe, buffer, transfer_len, interval); }
common/usb_kbd.c +4 -4
@@ -340,8 +340,8 @@ static inline void usb_kbd_poll_for_event(struct usb_device *dev)struct usb_kbd_pdata *data = dev->privptr;/* Submit a interrupt transfer request */ -if (usb_submit_int_msg (dev, data->intpipe, &data->new[0 ], - data->intpktsize, data->intinterval) >=0 ) +if (usb_int_msg (dev, data->intpipe, &data->new[0 ], + data->intpktsize, data->intinterval) >=0 )usb_kbd_irq_worker (dev);#elif defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP ) || \ defined(CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE )
@@ -504,8 +504,8 @@ static int usb_kbd_probe_dev(struct usb_device *dev, unsigned int ifnum)if (usb_get_report (dev, iface->desc.bInterfaceNumber,1 ,0 , data->new,USB_KBD_BOOT_REPORT_SIZE ) <0 ) {#else -if (usb_submit_int_msg (dev, data->intpipe, data->new, data->intpktsize, - data->intinterval) <0 ) { +if (usb_int_msg (dev, data->intpipe, data->new, data->intpktsize, + data->intinterval) <0 ) {#endif printf ("Failed to get keyboard state from device %04x:%04x\n" , dev->descriptor.idVendor, dev->descriptor.idProduct);
include/usb.h +2 -2
@@ -261,8 +261,8 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe, void *data, unsigned short size, int timeout);int usb_bulk_msg (struct usb_device *dev,unsigned int pipe,void *data,int len,int *actual_length,int timeout); -int usb_submit_int_msg (struct usb_device *dev,unsigned long pipe, -void *buffer,int transfer_len,int interval); +int usb_int_msg (struct usb_device *dev,unsigned long pipe, +void *buffer,int transfer_len,int interval);int usb_disable_asynch (int disable);int usb_maxpacket (struct usb_device *dev,unsigned long pipe); int usb_get_configuration_no(struct usb_device *dev, int cfgno,
Signature · 1 line
2.22.0
PATCH v5 3/5 usb: storage: submit_int_msg -> usb_int_msg
In reply to Michal SuchanekUse the wrapper as other callers do.
---
v2: usb_submit_int_msg -> usb_int_msg
v3: fix indentation
v5: fix superfluous space in type cast
--- common/usb_storage.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
common/usb_storage.c +2 -2
@@ -650,8 +650,8 @@ static int usb_stor_CBI_get_status(struct scsi_cmd *srb, struct us_data *us)int timeout; us->ip_wanted =1 ; -submit_int_msg (us->pusb_dev, us->irqpipe, - (void *) &us->ip_data, us->irqmaxp, us->irqinterval); +usb_int_msg (us->pusb_dev, us->irqpipe, + (void *)&us->ip_data, us->irqmaxp, us->irqinterval); timeout =1000 ;while (timeout--) {if (us->ip_wanted ==0 )
Signature · 1 line
2.22.0
PATCH v5 4/5 usb: Add nonblock argument to submit_int_msg
In reply to Michal SuchanekThis will be used to implement non-blocking keyboard polling in case of errors.
---
v2: add missing hunk from last patch
v4:
- propagate nonblock argument to wrapper
- add documentation of nonblock argument to wrapper
v5:
- also propagate the extra argument to USB emulator
- wrap lines slightly over 80 characters
--- common/usb.c | 9 ++++++--- common/usb_kbd.c | 4 ++-- common/usb_storage.c | 2 +- drivers/usb/emul/sandbox_keyb.c | 3 ++- drivers/usb/emul/usb-emul-uclass.c | 6 ++++-- drivers/usb/host/dwc2.c | 13 ++++++++----- drivers/usb/host/ehci-hcd.c | 13 ++++++++----- drivers/usb/host/ohci-hcd.c | 4 ++-- drivers/usb/host/r8a66597-hcd.c | 2 +- drivers/usb/host/sl811-hcd.c | 2 +- drivers/usb/host/usb-sandbox.c | 5 +++-- drivers/usb/host/usb-uclass.c | 5 +++-- drivers/usb/host/xhci.c | 13 ++++++++----- drivers/usb/musb-new/musb_uboot.c | 12 +++++++----- include/usb.h | 9 +++++---- 15 files changed, 61 insertions(+), 41 deletions(-)
common/usb.c +6 -3
@@ -192,12 +192,15 @@ int usb_disable_asynch(int disable)*/ /* -* submits an Interrupt Message +* submits an Interrupt Message. Some drivers may implement non-blocking +* polling: when non-block is true and the device is not responding return +* -EAGAIN instead of waiting for device to respond. */ int usb_int_msg (struct usb_device *dev,unsigned long pipe, -void *buffer,int transfer_len,int interval) +void *buffer,int transfer_len,int interval,bool nonblock) { -return submit_int_msg (dev, pipe, buffer, transfer_len, interval); +return submit_int_msg (dev, pipe, buffer, transfer_len, interval, + nonblock); }/*
common/usb_kbd.c +2 -2
@@ -341,7 +341,7 @@ static inline void usb_kbd_poll_for_event(struct usb_device *dev)/* Submit a interrupt transfer request */ if (usb_int_msg (dev, data->intpipe, &data->new[0 ], - data->intpktsize, data->intinterval) >=0 ) + data->intpktsize, data->intinterval, true) >=0 )usb_kbd_irq_worker (dev);#elif defined(CONFIG_SYS_USB_EVENT_POLL_VIA_CONTROL_EP ) || \ defined(CONFIG_SYS_USB_EVENT_POLL_VIA_INT_QUEUE )
@@ -505,7 +505,7 @@ static int usb_kbd_probe_dev(struct usb_device *dev, unsigned int ifnum) 1, 0, data->new, USB_KBD_BOOT_REPORT_SIZE) < 0) {#else if (usb_int_msg (dev, data->intpipe, data->new, data->intpktsize, - data->intinterval) <0 ) { + data->intinterval, false) <0 ) {#endif printf ("Failed to get keyboard state from device %04x:%04x\n" , dev->descriptor.idVendor, dev->descriptor.idProduct);
common/usb_storage.c +1 -1
@@ -651,7 +651,7 @@ static int usb_stor_CBI_get_status(struct scsi_cmd *srb, struct us_data *us) us->ip_wanted =1 ;usb_int_msg (us->pusb_dev, us->irqpipe, - (void *)&us->ip_data, us->irqmaxp, us->irqinterval); + (void *)&us->ip_data, us->irqmaxp, us->irqinterval, false); timeout =1000 ;while (timeout--) {if (us->ip_wanted ==0 )
drivers/usb/emul/sandbox_keyb.c +2 -1
@@ -178,7 +178,8 @@ static int sandbox_keyb_control(struct udevice *dev, struct usb_device *udev, }static int sandbox_keyb_interrupt (struct udevice *dev,struct usb_device *udev, -unsigned long pipe,void *buffer,int length,int interval) +unsigned long pipe,void *buffer,int length,int interval, +bool nonblock) {struct sandbox_keyb_priv *priv =dev_get_priv (dev);uint8_t *data = buffer;
drivers/usb/emul/usb-emul-uclass.c +4 -2
@@ -245,7 +245,8 @@ int usb_emul_bulk(struct udevice *emul, struct usb_device *udev, }int usb_emul_int (struct udevice *emul,struct usb_device *udev, -unsigned long pipe,void *buffer,int length,int interval) +unsigned long pipe,void *buffer,int length,int interval, +bool nonblock) {struct dm_usb_ops *ops =usb_get_emul_ops (emul);
@@ -253,7 +254,8 @@ int usb_emul_int(struct udevice *emul, struct usb_device *udev,return -ENOSYS ;debug ("%s: dev=%s\n" , __func__, emul->name); -return ops->interrupt (emul, udev, pipe, buffer, length, interval); +return ops->interrupt (emul, udev, pipe, buffer, length, interval, + nonblock); } int usb_emul_setup_device(struct udevice *dev, struct usb_string *strings,
drivers/usb/host/dwc2.c +8 -5
@@ -1108,7 +1108,8 @@ static int _submit_control_msg(struct dwc2_priv *priv, struct usb_device *dev, }int _submit_int_msg (struct dwc2_priv *priv,struct usb_device *dev, -unsigned long pipe,void *buffer,int len,int interval) +unsigned long pipe,void *buffer,int len,int interval, +bool nonblock) {unsigned long timeout;int ret;
@@ -1236,9 +1237,10 @@ int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer, }int submit_int_msg (struct usb_device *dev,unsigned long pipe,void *buffer, -int len,int interval) +int len,int interval,bool nonblock) { -return _submit_int_msg (&local, dev, pipe, buffer, len, interval); +return _submit_int_msg (&local, dev, pipe, buffer, len, interval, + nonblock); }/* U-Boot USB control interface */
@@ -1292,13 +1294,14 @@ static int dwc2_submit_bulk_msg(struct udevice *dev, struct usb_device *udev,static int dwc2_submit_int_msg (struct udevice *dev,struct usb_device *udev,unsigned long pipe,void *buffer,int length, -int interval) +int interval,bool nonblock) {struct dwc2_priv *priv =dev_get_priv (dev);debug ("%s: dev='%s', udev=%p\n" , __func__, dev->name, udev); -return _submit_int_msg (priv, udev, pipe, buffer, length, interval); +return _submit_int_msg (priv, udev, pipe, buffer, length, interval, + nonblock); }static int dwc2_usb_ofdata_to_platdata (struct udevice *dev)
drivers/usb/host/ehci-hcd.c +8 -5
@@ -1482,7 +1482,8 @@ out: }static int _ehci_submit_int_msg (struct usb_device *dev,unsigned long pipe, -void *buffer,int length,int interval) +void *buffer,int length,int interval, +bool nonblock) {void *backbuffer;struct int_queue *queue;
@@ -1532,9 +1533,10 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer, }int submit_int_msg (struct usb_device *dev,unsigned long pipe, -void *buffer,int length,int interval) +void *buffer,int length,int interval,bool nonblock) { -return _ehci_submit_int_msg (dev, pipe, buffer, length, interval); +return _ehci_submit_int_msg (dev, pipe, buffer, length, interval, + nonblock); } struct int_queue *create_int_queue(struct usb_device *dev,
@@ -1576,10 +1578,11 @@ static int ehci_submit_bulk_msg(struct udevice *dev, struct usb_device *udev,static int ehci_submit_int_msg (struct udevice *dev,struct usb_device *udev,unsigned long pipe,void *buffer,int length, -int interval) +int interval,bool nonblock) {debug ("%s: dev='%s', udev=%p\n" , __func__, dev->name, udev); -return _ehci_submit_int_msg (udev, pipe, buffer, length, interval); +return _ehci_submit_int_msg (udev, pipe, buffer, length, interval, + nonblock); } static struct int_queue *ehci_create_int_queue(struct udevice *dev,
drivers/usb/host/ohci-hcd.c +2 -2
@@ -1703,7 +1703,7 @@ int submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer, }int submit_int_msg (struct usb_device *dev,unsigned long pipe,void *buffer, -int transfer_len,int interval) +int transfer_len,int interval,bool nonblock) {info ("submit_int_msg" ); return submit_common_msg(&gohci, dev, pipe, buffer, transfer_len, NULL,
@@ -2155,7 +2155,7 @@ static int ohci_submit_bulk_msg(struct udevice *dev, struct usb_device *udev,static int ohci_submit_int_msg (struct udevice *dev,struct usb_device *udev,unsigned long pipe,void *buffer,int length, -int interval) +int interval,bool nonblock) {ohci_t *ohci =dev_get_priv (usb_get_bus (dev));
drivers/usb/host/r8a66597-hcd.c +1 -1
@@ -822,7 +822,7 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe, }int submit_int_msg (struct usb_device *dev,unsigned long pipe,void *buffer, -int transfer_len,int interval) +int transfer_len,int interval,bool nonblock) {/* no implement */ R8A66597_DPRINT ("%s\n" , __func__);
drivers/usb/host/sl811-hcd.c +1 -1
@@ -384,7 +384,7 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer, }int submit_int_msg (struct usb_device *dev,unsigned long pipe,void *buffer, -int len,int interval) +int len,int interval,bool nonblock) {PDEBUG (0 ,"dev = %p pipe = %#lx buf = %p size = %d int = %d\n" , dev, pipe, buffer, len, interval);
drivers/usb/host/usb-sandbox.c +3 -2
@@ -99,7 +99,7 @@ static int sandbox_submit_bulk(struct udevice *bus, struct usb_device *udev,static int sandbox_submit_int (struct udevice *bus,struct usb_device *udev,unsigned long pipe,void *buffer,int length, -int interval) +int interval,bool nonblock) {struct udevice *emul;int ret;
@@ -110,7 +110,8 @@ static int sandbox_submit_int(struct udevice *bus, struct usb_device *udev,usbmon_trace (bus, pipe,NULL , emul);if (ret)return ret; - ret =usb_emul_int (emul, udev, pipe, buffer, length, interval); + ret =usb_emul_int (emul, udev, pipe, buffer, length, interval, + nonblock);return ret; }
drivers/usb/host/usb-uclass.c +3 -2
@@ -31,7 +31,7 @@ int usb_disable_asynch(int disable) }int submit_int_msg (struct usb_device *udev,unsigned long pipe,void *buffer, -int length,int interval) +int length,int interval,bool nonblock) {struct udevice *bus = udev->controller_dev;struct dm_usb_ops *ops =usb_get_ops (bus);
@@ -39,7 +39,8 @@ int submit_int_msg(struct usb_device *udev, unsigned long pipe, void *buffer,if (!ops->interrupt)return -ENOSYS ; -return ops->interrupt (bus, udev, pipe, buffer, length, interval); +return ops->interrupt (bus, udev, pipe, buffer, length, interval, + nonblock); } int submit_control_msg(struct usb_device *udev, unsigned long pipe,
drivers/usb/host/xhci.c +8 -5
@@ -1109,7 +1109,8 @@ unknown:* @return 0 */ static int _xhci_submit_int_msg (struct usb_device *udev,unsigned long pipe, -void *buffer,int length,int interval) +void *buffer,int length,int interval, +bool nonblock) {if (usb_pipetype (pipe) !=PIPE_INTERRUPT ) {printf ("non-interrupt pipe (type=%lu)" ,usb_pipetype (pipe));
@@ -1277,9 +1278,10 @@ int submit_bulk_msg(struct usb_device *udev, unsigned long pipe, void *buffer, }int submit_int_msg (struct usb_device *udev,unsigned long pipe,void *buffer, -int length,int interval) +int length,int interval,bool nonblock) { -return _xhci_submit_int_msg (udev, pipe, buffer, length, interval); +return _xhci_submit_int_msg (udev, pipe, buffer, length, interval, + nonblock); }/**
@@ -1386,10 +1388,11 @@ static int xhci_submit_bulk_msg(struct udevice *dev, struct usb_device *udev,static int xhci_submit_int_msg (struct udevice *dev,struct usb_device *udev,unsigned long pipe,void *buffer,int length, -int interval) +int interval,bool nonblock) {debug ("%s: dev='%s', udev=%p\n" , __func__, dev->name, udev); -return _xhci_submit_int_msg (udev, pipe, buffer, length, interval); +return _xhci_submit_int_msg (udev, pipe, buffer, length, interval, + nonblock); }static int xhci_alloc_device (struct udevice *dev,struct usb_device *udev)
drivers/usb/musb-new/musb_uboot.c +7 -5
@@ -110,7 +110,7 @@ static int _musb_submit_bulk_msg(struct musb_host_data *host,static int _musb_submit_int_msg (struct musb_host_data *host,struct usb_device *dev,unsigned long pipe, -void *buffer,int len,int interval) +void *buffer,int len,int interval,bool nonblock) {construct_urb (&host->urb, &host->hep, dev,USB_ENDPOINT_XFER_INT , pipe, buffer, len,NULL , interval);
@@ -268,9 +268,10 @@ int submit_control_msg(struct usb_device *dev, unsigned long pipe, }int submit_int_msg (struct usb_device *dev,unsigned long pipe, -void *buffer,int length,int interval) +void *buffer,int length,int interval,bool nonblock) { -return _musb_submit_int_msg (&musb_host, dev, pipe, buffer, length, interval); +return _musb_submit_int_msg (&musb_host, dev, pipe, buffer, length, + interval, nonblock); } struct int_queue *create_int_queue(struct usb_device *dev,
@@ -320,10 +321,11 @@ static int musb_submit_bulk_msg(struct udevice *dev, struct usb_device *udev,static int musb_submit_int_msg (struct udevice *dev,struct usb_device *udev,unsigned long pipe,void *buffer,int length, -int interval) +int interval,bool nonblock) {struct musb_host_data *host =dev_get_priv (dev); -return _musb_submit_int_msg (host, udev, pipe, buffer, length, interval); +return _musb_submit_int_msg (host, udev, pipe, buffer, length, interval, + nonblock); } static struct int_queue *musb_create_int_queue(struct udevice *dev,
include/usb.h +5 -4
@@ -184,7 +184,7 @@ int submit_bulk_msg(struct usb_device *dev, unsigned long pipe,int submit_control_msg (struct usb_device *dev,unsigned long pipe,void *buffer,int transfer_len,struct devrequest *setup);int submit_int_msg (struct usb_device *dev,unsigned long pipe,void *buffer, -int transfer_len,int interval); +int transfer_len,int interval,bool nonblock);#if definedCONFIG_USB_EHCI_HCD || definedCONFIG_USB_MUSB_HOST \ ||CONFIG_IS_ENABLED (DM_USB )
@@ -262,7 +262,7 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe,int usb_bulk_msg (struct usb_device *dev,unsigned int pipe,void *data,int len,int *actual_length,int timeout);int usb_int_msg (struct usb_device *dev,unsigned long pipe, -void *buffer,int transfer_len,int interval); +void *buffer,int transfer_len,int interval,bool nonblock);int usb_disable_asynch (int disable);int usb_maxpacket (struct usb_device *dev,unsigned long pipe); int usb_get_configuration_no(struct usb_device *dev, int cfgno,
@@ -708,7 +708,7 @@ struct dm_usb_ops {*/ int (*interrupt)(struct udevice *bus,struct usb_device *udev,unsigned long pipe,void *buffer,int length, -int interval); +int interval,bool nonblock);/** * create_int_queue() - Create and queue interrupt packets
@@ -1029,7 +1029,8 @@ int usb_emul_bulk(struct udevice *emul, struct usb_device *udev,* @return 0 if OK, -ve on error */ int usb_emul_int (struct udevice *emul,struct usb_device *udev, -unsigned long pipe,void *buffer,int length,int interval); +unsigned long pipe,void *buffer,int length,int interval, +bool nonblock);/** * usb_emul_find() - Find an emulator for a particular device
Signature · 1 line
2.22.0
PATCH v5 5/5 dwc2: use the nonblock argument in submit_int_msg
In reply to Michal SuchanekAn USB 1.1 keyboard connected to dwc2 through a high-speed hub does not report status until it changes. With this patch you can enable keyboard by pressing a key while USB devices are probed. Without a keypress no state is reported and the probe times out. We don't want to wait for a keypress or timeout while polling for keypresses so implement an int_msg nonblock variant that exits early on error.
---
v2: move superfluous hunk to earlier patch
--- drivers/usb/host/dwc2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/host/dwc2.c +1 -1
@@ -1123,7 +1123,7 @@ int _submit_int_msg(struct dwc2_priv *priv, struct usb_device *dev,return -ETIMEDOUT ; } ret =_submit_bulk_msg (priv, dev, pipe, buffer, len); -if (ret != -EAGAIN ) +if ((ret != -EAGAIN ) || nonblock)return ret; } }
Signature · 1 line
2.22.0
Marek Vasut
AppliedPATCH v5 1/5 usb_kdb: only process events successfully received
In reply to Michal SuchanekQuoted 7 lines · Michal Suchanek
Causes unbound key repeat on error otherwise.
Signed-off-by Michal Suchanek <[email protected]>---
v2: fix indentation
v4: fix ! condition to >= 0
v5: fix commit message typo
Applied all, thanks.
PATCH v5 1/5 usb_kdb: only process events successfully received
In reply to Michal SuchanekQuoted 7 lines · Michal Suchanek
Causes unbound key repeat on error otherwise.
Signed-off-by Michal Suchanek <[email protected]>---
v2: fix indentation
v4: fix ! condition to >= 0
v5: fix commit message typo
The series still fails to build:
https://travis-ci.org/marex/u-boot-usb/jobs/575422882
PATCH 1/1 Add the submit_int_msg nonblock argument in musb_hcd.c
--- drivers/usb/musb/musb_hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Can you squash this to [4/5] or do you want to respin?
Thanks
Michal
drivers/usb/musb/musb_hcd.c +1 -1
@@ -1050,7 +1050,7 @@ int usb_lowlevel_stop(int index)* transfers are not supported. */ int submit_int_msg (struct usb_device *dev,unsigned long pipe, -void *buffer,int len,int interval) +void *buffer,int len,int interval,bool nonblock) {int dir_out =usb_pipeout (pipe);int ep =usb_pipeendpoint (pipe);
Signature · 1 line
2.22.0
PATCH 1/1 Add the submit_int_msg nonblock argument in musb_hcd.c
Quoted 6 lines · Michal Suchanek
Signed-off-by Michal Suchanek <[email protected]>--- drivers/usb/musb/musb_hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Can you squash this to [4/5] or do you want to respin?
Squashed and pushed, please check if it's OK.
PATCH 1/1 Add the submit_int_msg nonblock argument in musb_hcd.c
Quoted 9 lines · On Fri, 23 Aug 2019 23:11:44 +0200 Marek Vasut <[email protected]> wrote:
Quoted 6 lines · Michal Suchanek
Signed-off-by Michal Suchanek <[email protected]>--- drivers/usb/musb/musb_hcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Can you squash this to [4/5] or do you want to respin?
Squashed and pushed, please check if it's OK.
Looks OK, thanks