Re: [PATCH net-next 0/5] mlx4 misc fixes and improvements
On 19/09/2016 8:32 AM, Or Gerlitz wrote: On Mon, Sep 19, 2016 at 5:00 AM, David Millerwrote: From: Tariq Toukan Date: Sun, 18 Sep 2016 10:27:23 +0300 Hi Dave, On 16/09/2016 2:21 AM, David Miller wrote: From: Tariq Toukan Date: Mon, 12 Sep 2016 16:20:11 +0300 This patchset contains some bug fixes, a cleanup, and small improvements from the team to the mlx4 Eth and core drivers. Series generated against net-next commit: 02154927c115 "net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device" Please push the following patch to -stable >= 4.6 as well: "net/mlx4_core: Fix to clean devlink resources" Again, coding style fixes and optimizations like branch prediction hints are not bug fixes and therefore not appropriate for 'net'. Yes, I know. Please notice that it was submitted to net-next this time. This is completely incompatible with a request for one of the changes to go into -stable. If the change is not in 'net', it can't go to -stable. Dave, So when we're pretty late in the 4.8-rc cycle, a fix for a problem which was not introduced in 4.8-rc1 was targeted to net-next (4.9) and not net. This indeed creates a small mess when the fix needs to go to -stable as well. I guess the correct thing to do next time, would be to either send to net and ask you to take it to stable as part of picking the patch -- or send to net-next, and later send you a request to put it to stable -- or, wait a bit and send it to net of the next kernel along with stable request... we will pick one of these three way of doings next (...) time. So, at this point, I think it would be just correct to take the series to net-next, and on a future point we'll issue a request to push the patch into stable. Or. Or. Hi Dave, I see that the series status is 'Changes requested'. I agree with Or. If possible, please take the series, and we will issue a request to push into -stable in the future. Anyway, I can also do a re-submission if you prefer. Just let me know. Thanks, Tariq
Re: [PATCH net-next 0/5] mlx4 misc fixes and improvements
From: Tariq ToukanDate: Tue, 20 Sep 2016 11:50:17 +0300 >> So when we're pretty late in the 4.8-rc cycle, a fix for a problem >> which was not introduced in 4.8-rc1 was targeted to net-next (4.9) and >> not net. >> >> This indeed creates a small mess when the fix needs to go to -stable >> as well. ... > I see that the series status is 'Changes requested'. > I agree with Or. If possible, please take the series, and we will > issue a request to push into -stable in the future. > Anyway, I can also do a re-submission if you prefer. Just let me know. Either the bug exists in pre-net trees and needs to go to -stable, or it does not. If it does, you submit the change targetting 'net'. This whole mess occurred because you tried to combine changes inappropriate for 'net' with the bug fix. Instead of fixing the issue properly, by removing the cleanups and inappropriate changes, you tried to target 'net-next' instead. That's why this mess exists. Please send the change properly, targetting 'net', and not alongside changes which are inappropriate to 'net'. There is no other acceptable way to resolve this problem. Thank you.
Re: [PATCH net-next 0/5] mlx4 misc fixes and improvements
On Mon, Sep 19, 2016 at 5:00 AM, David Millerwrote: > From: Tariq Toukan > Date: Sun, 18 Sep 2016 10:27:23 +0300 > >> Hi Dave, >> >> On 16/09/2016 2:21 AM, David Miller wrote: >>> From: Tariq Toukan >>> Date: Mon, 12 Sep 2016 16:20:11 +0300 >>> This patchset contains some bug fixes, a cleanup, and small improvements from the team to the mlx4 Eth and core drivers. Series generated against net-next commit: 02154927c115 "net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device" Please push the following patch to -stable >= 4.6 as well: "net/mlx4_core: Fix to clean devlink resources" >>> Again, coding style fixes and optimizations like branch prediction >>> hints are not bug fixes and therefore not appropriate for 'net'. >> Yes, I know. Please notice that it was submitted to net-next this >> time. > > This is completely incompatible with a request for one of the changes > to go into -stable. > > If the change is not in 'net', it can't go to -stable. Dave, So when we're pretty late in the 4.8-rc cycle, a fix for a problem which was not introduced in 4.8-rc1 was targeted to net-next (4.9) and not net. This indeed creates a small mess when the fix needs to go to -stable as well. I guess the correct thing to do next time, would be to either send to net and ask you to take it to stable as part of picking the patch -- or send to net-next, and later send you a request to put it to stable -- or, wait a bit and send it to net of the next kernel along with stable request... we will pick one of these three way of doings next (...) time. So, at this point, I think it would be just correct to take the series to net-next, and on a future point we'll issue a request to push the patch into stable. Or. Or.
Re: [PATCH net-next 0/5] mlx4 misc fixes and improvements
From: Tariq ToukanDate: Sun, 18 Sep 2016 10:27:23 +0300 > Hi Dave, > > On 16/09/2016 2:21 AM, David Miller wrote: >> From: Tariq Toukan >> Date: Mon, 12 Sep 2016 16:20:11 +0300 >> >>> This patchset contains some bug fixes, a cleanup, and small >>> improvements >>> from the team to the mlx4 Eth and core drivers. >>> >>> Series generated against net-next commit: >>> 02154927c115 "net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device" >>> >>> Please push the following patch to -stable >= 4.6 as well: >>> "net/mlx4_core: Fix to clean devlink resources" >> Again, coding style fixes and optimizations like branch prediction >> hints are not bug fixes and therefore not appropriate for 'net'. > Yes, I know. Please notice that it was submitted to net-next this > time. This is completely incompatible with a request for one of the changes to go into -stable. If the change is not in 'net', it can't go to -stable.
Re: [PATCH net-next 0/5] mlx4 misc fixes and improvements
Hi Dave, On 16/09/2016 2:21 AM, David Miller wrote: From: Tariq ToukanDate: Mon, 12 Sep 2016 16:20:11 +0300 This patchset contains some bug fixes, a cleanup, and small improvements from the team to the mlx4 Eth and core drivers. Series generated against net-next commit: 02154927c115 "net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device" Please push the following patch to -stable >= 4.6 as well: "net/mlx4_core: Fix to clean devlink resources" Again, coding style fixes and optimizations like branch prediction hints are not bug fixes and therefore not appropriate for 'net'. Yes, I know. Please notice that it was submitted to net-next this time. Regards, Tariq
Re: [PATCH net-next 0/5] mlx4 misc fixes and improvements
On Fri, Sep 16, 2016 at 2:21 AM, David Millerwrote: > From: Tariq Toukan > Date: Mon, 12 Sep 2016 16:20:11 +0300 > >> This patchset contains some bug fixes, a cleanup, and small improvements >> from the team to the mlx4 Eth and core drivers. >> >> Series generated against net-next commit: >> 02154927c115 "net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device" >> >> Please push the following patch to -stable >= 4.6 as well: >> "net/mlx4_core: Fix to clean devlink resources" > > Again, coding style fixes and optimizations like branch prediction > hints are not bug fixes and therefore not appropriate for 'net'. Hi Dave, He sent it to net-next, not net... ok? Or.
Re: [PATCH net-next 0/5] mlx4 misc fixes and improvements
From: Tariq ToukanDate: Mon, 12 Sep 2016 16:20:11 +0300 > This patchset contains some bug fixes, a cleanup, and small improvements > from the team to the mlx4 Eth and core drivers. > > Series generated against net-next commit: > 02154927c115 "net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device" > > Please push the following patch to -stable >= 4.6 as well: > "net/mlx4_core: Fix to clean devlink resources" Again, coding style fixes and optimizations like branch prediction hints are not bug fixes and therefore not appropriate for 'net'.
[PATCH net-next 0/5] mlx4 misc fixes and improvements
Hi Dave, This patchset contains some bug fixes, a cleanup, and small improvements from the team to the mlx4 Eth and core drivers. Series generated against net-next commit: 02154927c115 "net: dsa: bcm_sf2: Get VLAN_PORT_MASK from b53_device" Please push the following patch to -stable >= 4.6 as well: "net/mlx4_core: Fix to clean devlink resources" Thanks, Tariq. Jack Morgenstein (1): net/mlx4_core: Fix deadlock when switching between polling and event fw commands Kamal Heib (2): net/mlx4_en: Fix wrong indentation net/mlx4_core: Fix to clean devlink resources Leon Romanovsky (1): net/mlx4_core: Use RCU to perform radix tree lookup for SRQ Tariq Toukan (1): net/mlx4_en: Add branch prediction hints in RX data-path drivers/net/ethernet/mellanox/mlx4/cmd.c | 23 +-- drivers/net/ethernet/mellanox/mlx4/en_rx.c | 28 +++- drivers/net/ethernet/mellanox/mlx4/main.c | 3 +++ drivers/net/ethernet/mellanox/mlx4/mlx4.h | 2 ++ drivers/net/ethernet/mellanox/mlx4/srq.c | 14 +- 5 files changed, 42 insertions(+), 28 deletions(-) -- 1.8.3.1