Skip to content

Made non-upstream patch design order aware#41

Closed
vivekrnv wants to merge 2 commits intomasterfrom
non_upstream_order
Closed

Made non-upstream patch design order aware#41
vivekrnv wants to merge 2 commits intomasterfrom
non_upstream_order

Conversation

@vivekrnv
Copy link
Owner

@vivekrnv vivekrnv commented Feb 25, 2023

Why I did it

Currently, non upstream patches are applied only after upstream patches.

What I did it

  • Non upstream Patches that reside in the sonic repo will not be saved in a tar file bur rather in a folder pointed out by EXTERNAL_KERNEL_PATCH_LOC. This is to make changes to the non upstream patches easily traceable.
  • The build variable name is also updated to INCLUDE_EXTERNAL_PATCHES
  • Files/folders expected under EXTERNAL_KERNEL_PATCH_LOC
EXTERNAL_KERNEL_PATCH_LOC/
       ├──── patches/
             ├── 0001-xxxxx.patch
             ├── 0001-yyyyyyyy.patch
             ├── .............
       ├──── series.patch
  • series.patch should contain a diff that is applied on the sonic-linux-kernel/patch/series file. The diff should include all the non-upstream patches.

How to verify it

Build the Kernel and verified if all the patches are applied properly

Which release branch to backport (provide reason below if selected)

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211

Description for the changelog

Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU.

Link to config_db schema for YANG module changes

A picture of a cute animal (not mandatory but encouraged)

@vivekrnv vivekrnv force-pushed the non_upstream_order branch 2 times, most recently from 9ef3520 to c09bc46 Compare March 15, 2023 00:21
@keboliu
Copy link

keboliu commented Mar 20, 2023

I suppose you will add the code changes to handle the kconfig, right?

@vivekrnv
Copy link
Owner Author

I suppose you will add the code changes to handle the kconfig, right?

That’ll be a different PR. #43 This includes the hw-mgmt changes as well

@vivekrnv vivekrnv closed this Mar 27, 2023
vivekrnv pushed a commit that referenced this pull request Dec 5, 2024
…ly (sonic-net#20959)

#### Why I did it
src/sonic-stp
```
* ea85d65 - (HEAD -> master, origin/master, origin/HEAD) [ci] Add arm64 build on PR validation. (#41) (20 hours ago) [Xin Wang]
* 6cdf964 - fix (25 hours ago) [Shilong Liu]
* 40cd2d5 - fix (2 days ago) [Shilong Liu]
* 0bfbed4 - makefile (2 days ago) [Shilong Liu]
* 837b0ce - makefile (2 days ago) [Shilong Liu]
* 0ef306e - fix (2 days ago) [Shilong Liu]
* 859374c - fix (2 days ago) [Shilong Liu]
* 7d65161 - fix (2 days ago) [Shilong Liu]
* 6580a62 - fix (2 days ago) [Shilong Liu]
* 017f2a9 - fix (2 days ago) [Shilong Liu]
* a26b6c2 - [ci] Try building on arm agent. (2 days ago) [Shilong Liu]
```
#### How I did it
#### How to verify it
#### Description for the changelog
vivekrnv pushed a commit that referenced this pull request Mar 24, 2025
…lly (sonic-net#701)

#### Why I did it
src/sonic-swss
```
* bdc4fe0 - (HEAD -> 202412, origin/202412) Merge pull request #42 from r12f/code-sync-202412 (9 hours ago) [Riff]
|\ 
| failure_prs.log skip_prs.log 054f912 - Merge remote-tracking branch 'base/202411' into code-sync-202412 (18 hours ago) [r12f]
| failure_prs.log skip_prs.log e21b5a5 - Link orchagent against jemalloc (sonic-net#3530) (2 days ago) [mssonicbld]
| failure_prs.log skip_prs.log aac84b5 - Merge pull request sonic-net#3531 from mssonicbld/cherry/202411/3426 (2 days ago) [Kumaresh Perumal]
| |\ 
| | failure_prs.log skip_prs.log 272f45a - vlanmgrd not to throw exception for Portchannel ip link add because of race condition with PortChannel removal. (2 days ago) [Sonic Build Admin]
| |/ 
| failure_prs.log skip_prs.log 16f5331 - [vlanmgrd]: Fixing an issue causing mismatch between MAC and link-local IPv6 addresses of VLAN and Bridge interfaces (sonic-net#3527) (5 days ago) [mssonicbld]
| failure_prs.log skip_prs.log 4d3bae4 - Avoid removing a VRF routing table when there are pending creation entries in gRouteBulker (sonic-net#3526) (6 days ago) [mssonicbld]
| failure_prs.log skip_prs.log 9875694 - Added change not to create ECMP Group in SAI and program the route if none of ECMP members are active/link-up (sonic-net#3522) (7 days ago) [mssonicbld]
| failure_prs.log skip_prs.log 60fd735 - [BufferOrch] Use SAI bulk API to configure port, PG and queue (sonic-net#3523) (7 days ago) [mssonicbld]
| failure_prs.log skip_prs.log 5071bec - Merge pull request sonic-net#3519 from stepanblyschak/202411-fc-after-apply-view (7 days ago) [Kumaresh Perumal]
| |\ 
| | failure_prs.log skip_prs.log c3437bd - [202411][FC] process FC after apply view (9 days ago) [Stepan Blyschak]
| |/ 
| failure_prs.log skip_prs.log 5031aad - Capability query for MACSEC ACL attribute (sonic-net#3511) (2 weeks ago) [mssonicbld]
| failure_prs.log skip_prs.log 4b357e5 - Fix VRF update handling for loopback interfaces in IntfsOrch (sonic-net#3512) (2 weeks ago) [mssonicbld]
| failure_prs.log skip_prs.log fe98176 - Add a delay between killing teamd processes (sonic-net#3510) (2 weeks ago) [mssonicbld]
| failure_prs.log skip_prs.log e967711 - Remove RIF from m_rifsToAdd before deleting it (sonic-net#3499) (3 weeks ago) [mssonicbld]
| failure_prs.log skip_prs.log 337c9a1 - Optimize counter polling interval by making it more accurate (sonic-net#3500) (3 weeks ago) [mssonicbld]
* b9b4108 - Merge pull request #41 from Azure/revert-40-cherry/msft-202412/3481 (10 hours ago) [Riff]
* 824d021 - (origin/revert-40-cherry/msft-202412/3481) Revert "[hash] add SAI_NATIVE_HASH_FIELD_IPV6_FLOW_LABEL to hash-field map fo…" (30 hours ago) [Riff]
```
#### How I did it
#### How to verify it
#### Description for the changelog
vivekrnv pushed a commit that referenced this pull request Mar 24, 2025
… automatically (sonic-net#732)

#### Why I did it
src/sonic-platform-common
```
* 4dde945 - (HEAD -> 202412, origin/202412) [code sync] Merge code from sonic-net/sonic-platform-common:202411 to 202412 (#41) (9 hours ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
vivekrnv pushed a commit that referenced this pull request Mar 24, 2025
…tomatically (sonic-net#918)

#### Why I did it
src/sonic-linux-kernel
```
* 1d1338c - (HEAD -> 202412, origin/HEAD, origin/202412) Merge pull request #41 from mssonicbld/sonicbld/202412-merge (11 hours ago) [mssonicbld]
* 16b753b - Merge branch '202411' of https://github.com/sonic-net/sonic-linux-kernel into 202412 (13 hours ago) [Sonic Automation]
* 8bd11c2 - Revert "[optoe] Reset page select byte to 0 before upper memory access on page 0h" (sonic-net#468) (3 weeks ago) [mssonicbld]
* a5e9588 - [optoe] Reset page select byte to 0 before upper memory access on page 0h (sonic-net#464) (4 weeks ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
vivekrnv pushed a commit that referenced this pull request Jul 1, 2025
…tically (sonic-net#23101)

#### Why I did it
src/sonic-dash-api
```
* 38853ef - (HEAD -> master, origin/master, origin/HEAD) Use ValueOrRange for trusted_vni fields (#41) (2 days ago) [Lawrence Lee]
* 5daac7d - Add outbound port map proto definitions (#40) (2 days ago) [Lawrence Lee]
```
#### How I did it
#### How to verify it
#### Description for the changelog
vivekrnv pushed a commit that referenced this pull request Jan 12, 2026
fbccffa (HEAD -> main, origin/main, origin/HEAD) Add function to validate and regenerate ONIE EEPROM cahce file if needed
72bf0c6 [H4-32D][H5-32D][H5-64D][H5-64O] Fix GPIO base change on Trixie (#41)
f3f90e3 Increase frequency of fstrim from weekly to daily for chassis
1b7645f [X4] Add support for IXR7250 X4 platform
2348e9b [H6-64] support kernel 6.12.x
3b36679 [H6-64] Add support for Nokia H6-64
16e8635 Modify hw-mnangement-generate-dump to include qfpga info log
23d69af Add mechanism to LC to send eeprom info to CHASSIS_STATE_DB
5f18eab [H5-64O]Update thermal algorithm according to HW spec V04
65293de [H5-64D][H5-64O]Update thermal algorithm
18686fe [H4-32D][H5-32D][H5-64D][H5-64O]Fix emc2305 driver fan speed initialization issue
6412f56 cpuctl i2c delay optic
5199ecf cpuctl i2c delay optic

Signed-off-by: mlok <[email protected]>
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.

2 participants