forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request sonic-net#210 from gechiang/202205
Manual Merge public 202205 to resolve conflict introduced by [202205] Update Linux kernel to 5.10.179 sonic-net#17569
- Loading branch information
Showing
31 changed files
with
101 additions
and
89 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule saibcm-modules-dnx
updated
4 files
+1 −1 | debian/control | |
+1 −1 | debian/opennsl-modules.dirs | |
+5 −5 | debian/opennsl-modules.install | |
+2 −2 | debian/rules |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
lib/modules/5.10.0-18-2-amd64/extra | ||
lib/modules/5.10.0-23-2-amd64/extra |
14 changes: 7 additions & 7 deletions
14
platform/broadcom/saibcm-modules/debian/opennsl-modules.install
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,8 @@ | ||
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/5.10.0-18-2-amd64/extra | ||
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/5.10.0-18-2-amd64/extra | ||
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/5.10.0-18-2-amd64/extra | ||
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/5.10.0-18-2-amd64/extra | ||
systems/linux/user/x86-smp_generic_64-2_6/linux-bcm-knet.ko lib/modules/5.10.0-23-2-amd64/extra | ||
systems/linux/user/x86-smp_generic_64-2_6/linux-kernel-bde.ko lib/modules/5.10.0-23-2-amd64/extra | ||
systems/linux/user/x86-smp_generic_64-2_6/linux-user-bde.ko lib/modules/5.10.0-23-2-amd64/extra | ||
systems/linux/user/x86-smp_generic_64-2_6/linux-knet-cb.ko lib/modules/5.10.0-23-2-amd64/extra | ||
systemd/opennsl-modules.service lib/systemd/system | ||
sdklt/linux/bde/linux_ngbde.ko lib/modules/5.10.0-18-2-amd64/extra | ||
sdklt/linux/knet/linux_ngknet.ko lib/modules/5.10.0-18-2-amd64/extra | ||
sdklt/linux/knetcb/linux_ngknetcb.ko lib/modules/5.10.0-18-2-amd64/extra | ||
sdklt/linux/bde/linux_ngbde.ko lib/modules/5.10.0-23-2-amd64/extra | ||
sdklt/linux/knet/linux_ngknet.ko lib/modules/5.10.0-23-2-amd64/extra | ||
sdklt/linux/knetcb/linux_ngknetcb.ko lib/modules/5.10.0-23-2-amd64/extra |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
28 changes: 14 additions & 14 deletions
28
platform/centec-arm64/tsingma-bsp/debian/tsingma-bsp.install
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,17 @@ | ||
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/pwm-ctc/pwm-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/ctc_wdt/ctc_wdt.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/ctcmac/ctcmac.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/ctcmac/ctc5236_mdio.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/ctc-phy/mars.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/i2c-ctc/i2c-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/gpio-ctc/gpio-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/ehci-ctc/ehci-ctc.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/5.10.0-18-2-arm64/kernel/extra | ||
src/ctc5236-mc/ctc5236-mc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/pwm-ctc/pwm-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/ctc5236_switch/ctc5236_switch.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/pinctrl-ctc/pinctrl-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/ctc_wdt/ctc_wdt.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/ctcmac/ctcmac.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/ctcmac/ctc5236_mdio.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/ctc-phy/mars.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/i2c-ctc/i2c-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/gpio-ctc/gpio-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/ehci-ctc/ehci-ctc.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/rtc-sd2405/rtc-sd2405.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/sdhci-ctc5236/sdhci-ctc5236.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/spi-ctc-qspi/spi-ctc-qspi.ko /lib/modules/5.10.0-23-2-arm64/kernel/extra | ||
src/ctc-dts/e530-ctc5236.dtb /boot/ | ||
src/config/fw_env.config /etc/ | ||
src/config/tsingma-bsp.service /lib/systemd/system |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.