Skip to content

Merge branch '3.0-dev' into 3.0 #967

Merged
cheeyanglee merged 7 commits into
3.0from
merge-3.0
May 29, 2026
Merged

Merge branch '3.0-dev' into 3.0 #967
cheeyanglee merged 7 commits into
3.0from
merge-3.0

Conversation

@cheeyanglee

Copy link
Copy Markdown
Contributor

Merge Checklist

All boxes should be checked before merging the PR

  • [] The changes in the PR have been built and tested
  • [] cgmanifest file has been updated if required
  • Ready to merge

Description

Any Newly Introduced Dependencies

How Has This Been Tested?

liulis-sg and others added 6 commits May 19, 2026 15:15
update expat version in pkggen_core_x86_64.txt and toolchain_x86_64.txt

Signed-off-by: Lishan Liu <lishan.liu@intel.com>
Update kernel to v6.12.84
- lts-v6.12.84-emt-260429T081924Z
- remove 0017-drm-i915-no-waiting-for-page-flip-in-vpp-case.drm
- disable CONFIG_INET6_ESP CONFIG_INET_ESP

Signed-off-by: Lishan Liu <lishan.liu@intel.com>
* update x/net version

* update x/net version

* update x/net version

* update x/net version
* Update edge node agents to 1.26.3

Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>

* Update patch version in build requires for PUA

Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>

* Fix date in inbm changelog

Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>

* Update version on inbm obsoletes

Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>

* Drop spectre all flag

Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>

* Updates for x-net bump to 0.53.0

Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>

---------

Signed-off-by: Rajeev Ranjan <rajeev2.ranjan@intel.com>
Co-authored-by: Niket Kumar <niket.kumar@intel.com>
…ed in EMT (#731) (#736)" (#957)

This reverts commit 2178497.

Signed-off-by: Shalini Singhal <shalinix.singhal@intel.com>
@cheeyanglee cheeyanglee requested a review from a team as a code owner May 29, 2026 01:21
Merge branch '3.0-dev' commit 570b321

Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com>
@cheeyanglee cheeyanglee merged commit 24a2a7f into 3.0 May 29, 2026
10 checks passed
@cheeyanglee cheeyanglee deleted the merge-3.0 branch May 29, 2026 02:45
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.

6 participants