Message ID | 20231122173041.3835620-1-anthony.l.nguyen@intel.com (mailing list archive) |
---|---|
State | Not Applicable |
Delegated to: | Netdev Maintainers |
Headers | show |
On Wed, Nov 22, 2023 at 12:30 PM Tony Nguyen <anthony.l.nguyen@intel.com> wrote: > > Update the various ice DDP packages to the latest versions. > > Thanks, > Tony > > The following changes since commit 9552083a783e5e48b90de674d4e3bf23bb855ab0: > > Merge branch 'robot/pr-0-1700470117' into 'main' (2023-11-20 13:09:23 +0000) > > are available in the Git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/firmware.git dev-queue > > for you to fetch changes up to c71fdbc575b79eff31db4ea243f98d5f648f7f0f: > > ice: update ice DDP wireless_edge package to 1.3.13.0 (2023-11-22 09:14:39 -0800) > > ---------------------------------------------------------------- > Przemek Kitszel (3): > ice: update ice DDP package to 1.3.35.0 > ice: update ice DDP comms package to 1.3.45.0 > ice: update ice DDP wireless_edge package to 1.3.13.0 Sending a pull request and all of the patches to the list individually seems to have confused the automation we have to grab stuff from the list. The first two patches are merged and pushed out: https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/75 https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/76 but we never got an auto-MR for patch #3, and the pull request MR now conflicts because we applied the first two patches in the series from the individual patches. https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/74 Mario or I can fix this up, but in the future it'll just be easier if you send either a pull request or individual patches, not both. josh > > WHENCE | 8 ++++---- > ...e_comms-1.3.40.0.pkg => ice_comms-1.3.45.0.pkg} | Bin 725428 -> 733736 bytes > ...1.3.10.0.pkg => ice_wireless_edge-1.3.13.0.pkg} | Bin 725428 -> 737832 bytes > .../ice/ddp/{ice-1.3.30.0.pkg => ice-1.3.35.0.pkg} | Bin 692660 -> 692776 bytes > 4 files changed, 4 insertions(+), 4 deletions(-) > rename intel/ice/ddp-comms/{ice_comms-1.3.40.0.pkg => ice_comms-1.3.45.0.pkg} (89%) > rename intel/ice/ddp-wireless_edge/{ice_wireless_edge-1.3.10.0.pkg => ice_wireless_edge-1.3.13.0.pkg} (88%) > rename intel/ice/ddp/{ice-1.3.30.0.pkg => ice-1.3.35.0.pkg} (88%)
On Wed, Nov 22, 2023 at 7:10 PM Josh Boyer <jwboyer@kernel.org> wrote: > > On Wed, Nov 22, 2023 at 12:30 PM Tony Nguyen <anthony.l.nguyen@intel.com> wrote: > > > > Update the various ice DDP packages to the latest versions. > > > > Thanks, > > Tony > > > > The following changes since commit 9552083a783e5e48b90de674d4e3bf23bb855ab0: > > > > Merge branch 'robot/pr-0-1700470117' into 'main' (2023-11-20 13:09:23 +0000) > > > > are available in the Git repository at: > > > > git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/firmware.git dev-queue > > > > for you to fetch changes up to c71fdbc575b79eff31db4ea243f98d5f648f7f0f: > > > > ice: update ice DDP wireless_edge package to 1.3.13.0 (2023-11-22 09:14:39 -0800) > > > > ---------------------------------------------------------------- > > Przemek Kitszel (3): > > ice: update ice DDP package to 1.3.35.0 > > ice: update ice DDP comms package to 1.3.45.0 > > ice: update ice DDP wireless_edge package to 1.3.13.0 > > Sending a pull request and all of the patches to the list individually > seems to have confused the automation we have to grab stuff from the > list. The first two patches are merged and pushed out: > > https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/75 > https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/76 > > but we never got an auto-MR for patch #3, and the pull request MR now > conflicts because we applied the first two patches in the series from > the individual patches. > > https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/74 > > Mario or I can fix this up, but in the future it'll just be easier if > you send either a pull request or individual patches, not both. The third patch is now merged and pushed out. https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/85 josh
On 11/27/2023 6:06 AM, Josh Boyer wrote: > On Wed, Nov 22, 2023 at 7:10 PM Josh Boyer <jwboyer@kernel.org> wrote: >> >> On Wed, Nov 22, 2023 at 12:30 PM Tony Nguyen <anthony.l.nguyen@intel.com> wrote: >>> >>> Update the various ice DDP packages to the latest versions. >>> >>> Thanks, >>> Tony >>> >>> The following changes since commit 9552083a783e5e48b90de674d4e3bf23bb855ab0: >>> >>> Merge branch 'robot/pr-0-1700470117' into 'main' (2023-11-20 13:09:23 +0000) >>> >>> are available in the Git repository at: >>> >>> git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/firmware.git dev-queue >>> >>> for you to fetch changes up to c71fdbc575b79eff31db4ea243f98d5f648f7f0f: >>> >>> ice: update ice DDP wireless_edge package to 1.3.13.0 (2023-11-22 09:14:39 -0800) >>> >>> ---------------------------------------------------------------- >>> Przemek Kitszel (3): >>> ice: update ice DDP package to 1.3.35.0 >>> ice: update ice DDP comms package to 1.3.45.0 >>> ice: update ice DDP wireless_edge package to 1.3.13.0 >> >> Sending a pull request and all of the patches to the list individually >> seems to have confused the automation we have to grab stuff from the >> list. The first two patches are merged and pushed out: >> >> https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/75 >> https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/76 >> >> but we never got an auto-MR for patch #3, and the pull request MR now >> conflicts because we applied the first two patches in the series from >> the individual patches. >> >> https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/74 >> >> Mario or I can fix this up, but in the future it'll just be easier if >> you send either a pull request or individual patches, not both. > > The third patch is now merged and pushed out. > > https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/85 Thanks Josh. I was out for the Thanksgiving holiday. Will send one or the other on future sends. - Tony
On Mon, Nov 27, 2023 at 11:21 AM Tony Nguyen <anthony.l.nguyen@intel.com> wrote: > > On 11/27/2023 6:06 AM, Josh Boyer wrote: > > On Wed, Nov 22, 2023 at 7:10 PM Josh Boyer <jwboyer@kernel.org> wrote: > >> > >> On Wed, Nov 22, 2023 at 12:30 PM Tony Nguyen <anthony.l.nguyen@intel.com> wrote: > >>> > >>> Update the various ice DDP packages to the latest versions. > >>> > >>> Thanks, > >>> Tony > >>> > >>> The following changes since commit 9552083a783e5e48b90de674d4e3bf23bb855ab0: > >>> > >>> Merge branch 'robot/pr-0-1700470117' into 'main' (2023-11-20 13:09:23 +0000) > >>> > >>> are available in the Git repository at: > >>> > >>> git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/firmware.git dev-queue > >>> > >>> for you to fetch changes up to c71fdbc575b79eff31db4ea243f98d5f648f7f0f: > >>> > >>> ice: update ice DDP wireless_edge package to 1.3.13.0 (2023-11-22 09:14:39 -0800) > >>> > >>> ---------------------------------------------------------------- > >>> Przemek Kitszel (3): > >>> ice: update ice DDP package to 1.3.35.0 > >>> ice: update ice DDP comms package to 1.3.45.0 > >>> ice: update ice DDP wireless_edge package to 1.3.13.0 > >> > >> Sending a pull request and all of the patches to the list individually > >> seems to have confused the automation we have to grab stuff from the > >> list. The first two patches are merged and pushed out: > >> > >> https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/75 > >> https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/76 > >> > >> but we never got an auto-MR for patch #3, and the pull request MR now > >> conflicts because we applied the first two patches in the series from > >> the individual patches. > >> > >> https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/74 > >> > >> Mario or I can fix this up, but in the future it'll just be easier if > >> you send either a pull request or individual patches, not both. > > > > The third patch is now merged and pushed out. > > > > https://gitlab.com/kernel-firmware/linux-firmware/-/merge_requests/85 > > Thanks Josh. I was out for the Thanksgiving holiday. Will send one or > the other on future sends. > > - Tony Even better - if you can open up MR directly at https://gitlab.com/kernel-firmware/linux-firmware we don't need to worry about the robot messing up or you needing to pull one back because of a mistake etc. Win win for everyone.