NAK: [SRU][J:linux-bluefield][Pull Request][v5] i2c-mlxbf.c: Sync up driver with upstreaming

[Asmaa Mnebhi]

Hi Tim,



I have already rebased it on the latest Jammy  Ubuntu-bluefield-5.15.0-1008.10

But If I misunderstood or made a mistake please let me know how to fix it.



This is the latest commit I see before I had applied my patch series starting with 37634b05eba76be930565e343800e0f4587241ea:

commit f54bb24b88f0eeb553c27c0150ea05ebcdcbf187 (origin/master-next, origin/HEAD, master-next-orig)

Author: David Thompson <davthompson at nvidia.com<mailto:davthompson at nvidia.com>>

Date:   Fri Aug 26 11:59:16 2022 -0400

    mlxbf_gige: compute MDIO period based on i1clk



I even see that in my forked branch:

https://asmaam@git.launchpad.net/~asmaam/ubuntu/+source/linux-bluefield/+git/version-seeds-1/log/?h=master-next





-----Original Message-----
From: Tim Gardner <tim.gardner at canonical.com>
Sent: Tuesday, October 11, 2022 11:37 AM
To: Asmaa Mnebhi <asmaa at nvidia.com>; kernel-team at lists.ubuntu.com
Subject: NAK: [SRU][J:linux-bluefield][Pull Request][v5] i2c-mlxbf.c: Sync up driver with upstreaming



On 10/11/22 8:48 AM, Asmaa Mnebhi wrote:

> This pull request (17 commits) includes reverting 8 i2c-mlxbf.c

> commits in Jammy linux-bluefield. Then it cherry-picks the i2c-mlxbf.c

> related commits from linux-next master branch.

>

> BugLink:

> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fbugs

> .launchpad.net%2Fbugs%2F1991551&data=05%7C01%7Casmaa%40nvidia.com%

> 7C703c1ef5485e4addc03408daab9e822f%7C43083d15727340c1b7db39efd9ccc17a%

> 7C0%7C0%7C638010994530325709%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwM

> DAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7C%7C&

> sdata=Pe1nwB7OoYNL15Omx2D4VR8ek30F%2FliskpURlj3DPL4%3D&reserved=0

>

> This pull request page can be found at:

>

> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fcode

> .launchpad.net%2F~asmaam%2Fubuntu%2F%2Bsource%2Flinux-bluefield%2F%2Bg

> it%2Fversion-seeds-1%2F%2Bmerge%2F430923&data=05%7C01%7Casmaa%40nv

> idia.com%7C703c1ef5485e4addc03408daab9e822f%7C43083d15727340c1b7db39ef

> d9ccc17a%7C0%7C0%7C638010994530325709%7CUnknown%7CTWFpbGZsb3d8eyJWIjoi

> MC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C%7

> C%7C&sdata=PeZxmMpoT6YV7hjBGfyl8w8T%2BKLgM9Mb3bcDbsYcGEs%3D&re

> served=0

>

> Git repo can be found at:

>

> git+ssh://asmaam@git.launchpad.net/~asmaam/ubuntu/+source/linux-bluefi

> git+eld/+git/version-seeds-1 master-next

>

> for you to fetch changes starting from commit

> 37634b05eba76be930565e343800e0f4587241ea

>

> Revert "UBUNTU: SAUCE: i2c-mlxbf.c: Add driver version"

>

> Signed-off-by: Asmaa Mnebhi <asmaa at nvidia.com<mailto:asmaa at nvidia.com>>

>

> Asmaa Mnebhi (17):

>    Revert "UBUNTU: SAUCE: i2c-mlxbf.c: Add driver version"

>    Revert "UBUNTU: SAUCE: i2c-mlxbf.c: Support lock mechanism"

>    Revert "UBUNTU: SAUCE: i2c-mlxbf.c: support BlueField-3 SoC"

>    Revert "UBUNTU: SAUCE: i2c-mlxbf: prevent stack overflow in

>      mlxbf_i2c_smbus_start_transaction()"

>    Revert "UBUNTU: SAUCE: i2c-mlxbf.c: incorrect base address passed

>      during io write"

>    Revert "UBUNTU: SAUCE: i2c-mlxbf.c: Add multi slave functionality"

>    Revert "UBUNTU: SAUNCE: i2c-mlxbf.c: remove IRQF_ONESHOT"

>    Revert "UBUNTU: SAUNCE: i2c-mlxbf.c: Fix frequency calculation"

>    i2c: mlxbf: incorrect base address passed during io write

>    i2c: mlxbf: prevent stack overflow in

>      mlxbf_i2c_smbus_start_transaction()

>    i2c: mlxbf: remove IRQF_ONESHOT

>    i2c: mlxbf: Fix frequency calculation

>    i2c: mlxbf: support lock mechanism

>    i2c: mlxbf: add multi slave functionality

>    i2c: mlxbf: support BlueField-3 SoC

>    i2c: mlxbf: remove device tree support

>    UBUNTU: SAUCE: i2c-mlxbf.c: Add driver version

>

>   .../bindings/i2c/mellanox,i2c-mlxbf.yaml      |  99 ----------

>   MAINTAINERS                                   |   1 -

>   drivers/i2c/busses/i2c-mlxbf.c                | 175 +++++++++---------

>   3 files changed, 90 insertions(+), 185 deletions(-)

>   delete mode 100644

> Documentation/devicetree/bindings/i2c/mellanox,i2c-mlxbf.yaml

>



Slow down and think about what you're doing. The current tip of jammy/linux-bluefield master-next is Ubuntu-bluefield-5.15.0-1008.10.

Re-apply your patch set on top of that tag so that you can ensure there are no conflicts and save the maintainer some effort when these patches are applied for real. It also wouldn't hurt to re-do some testing to ensure that your patch set hasn't introduced any regressions.



rtg

--

-----------

Tim Gardner

Canonical, Inc


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20221011/5b1ce04c/attachment.html>