Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge master and 1.4 along with due patches to merge to 1.4 #200

Closed
wants to merge 0 commits into from

Conversation

paravmellanox
Copy link
Contributor

@paravmellanox paravmellanox commented Jul 9, 2024

Hi Michael,

Can you please consider this pull request as gentle request to merge the changes of master branch and following patches which are been waiting to be merged for several days, weeks and months now for various patches.
You might be busy with other projects. Here is a work to help and speed up your workflow and accept the work of the community.

I resolved the merge conflict arise due to master and 1.4 branches. They are only of the editorial nature.
I also verified the generated specification draft pdf with these changes.

The intention is not to follow any different process.
The pull request is created only as reference to speed up your merge flow.

This pull request consist of

  1. merging master branch to 1.4.
    Commits 1 to 16.
  2. Patches for the issue virtio-blk: Fix incorrect data type of field num_queues #195
    https://lore.kernel.org/virtio-comment/hqicqs6p5h4r4xcdhmathfiegvcaly76ityqe67erj7c4b65ck@d2n6v53is5ya/T/#m6fc5341ecf3a68b5fc63ed5cd1b231aa2fb99961
  3. Patches for the issue virtio-net: Clarify the size of virtio_net_hdr for tx, rx along with receive buffer size #183
    https://lore.kernel.org/virtio-comment/[email protected]/T/#u
  4. Patches for the issue virtio-net: Support packet match fields based receive packet steering/forwarding #179
    https://lore.kernel.org/virtio-comment/[email protected]/T/#t
  5. patches for issue Support device state handling for PCI VFs #176
    https://lore.kernel.org/virtio-comment/[email protected]/T/#u
  6. patches for the issue virtio_pci_cap64: specify offset_hi, length_hi endianness #196
    https://lore.kernel.org/virtio-comment/PH0PR12MB5481A6C266BD5303B98AF5EEDCC72@PH0PR12MB5481.namprd12.prod.outlook.com/T/#m6d45232211d1e1b617171189515a5e11c9b7642c

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant