This repository has been archived by the owner on Mar 1, 2023. It is now read-only.
forked from sonic-net/sonic-buildimage
-
Notifications
You must be signed in to change notification settings - Fork 1
Conversation
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
…oot support on T0 (sonic-net#2998) Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
…#3004) minigraph may not be always available on the some system configuration. Should use config db as the source of truth.
sonic-swss: [vnet]: Extend Bitmap VNET test with "remove" flows (sonic-net#900) [vxlanorch] Ambiguous return code for removeNextHopTunnel (sonic-net#880) Address review comment: remove data member m_entriesCreated, which is introduced for dependancy resolution purpose. (sonic-net#839) Set LAG mtu value based on kernel netlink msg (sonic-net#922) [orchagent]: Remove try/catch for correct coredump file (sonic-net#790) [aclorch] unittest by gtest (sonic-net#924) [orchagent]: Added support of PFC WD for BFN platform (sonic-net#823) [vnetorch]: Fix tunnel route removal flow for bitmap VNET (sonic-net#912) pkill -9 zebra for frr warm restart VS test fix (sonic-net#927) swss-orchagent: add new orch for vnet routes/tunnel routes tables in CONFIG_DB (sonic-net#907) [debian]: Do not build test when building with real SAI (sonic-net#932) sonic-swss-common: Add schema for dot1p to tc mapping config table (sonic-net#274) Fix MIRROR_SESSION table macro name (sonic-net#264) [schema] Add VNET Route tables in config_db (sonic-net#279) [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#280) White-list clear_stats op from orchagent to syncd (sonic-net#281) Correct comment (sonic-net#282) sonic-sairedis: [debian]: Change build order in target binary (sonic-net#452) [debian] increment debian compatibility to 10 to enable parallel package build (sonic-net#461) Full sleep wait flex counter polling thread when POLL_COUNTER_STATUS is disable (sonic-net#462) add support for SAI_ATTR_VALUE_TYPE_ACL_CAPABILITY (sonic-net#460) Check if port VID exists in db on flex counter query (sonic-net#464) Full sleep wait change for PFC watchdog (sonic-net#465) Add synchronous clear_stats operation path (sonic-net#463) Modify sai_create_port to breakout a port for virtual switch (sonic-net#454) Fix typo (sonic-net#467) Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
--Create/remove port fix --Support SAI_PORT_ATTR_SERDES_IPREDRIVER --Egress ACL fix for PFC storm restoration --Memory corruption during warm reboot --SAI_OBJECT_TYPE_TUNNEL_MAP_ENTRY removal fix --Segfault/memory corruption fix during switch shutdown --Directed boardcast fix --Pre-emphasis value for Dell 6100 Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
* Update sonic-quagga submodule * [libteam]: Reimplement Warm-Reboot procedure
…onic-net#3000) * inject sdk libs to pmon * fix wrong code
* Set the default mac ageing time to 300 seconds The current mac ageing was disabled, this could lead the mac address table to increase over time and lead to resource and performance issues. Signed-off-by: Zhenggen Xu <zxu@linkedin.com> * Update the default HW ageing timer to be 600 seconds. This is to be on the safer side where ARP update interval is 300 seconds and SONiC does not flood when ARP is aged out. Signed-off-by: Zhenggen Xu <zxu@linkedin.com>
* [submodule] update sonic-linux-kernel * update linux kernel version * Fix many version strings * update mellanox components (built with new kernel) * [mlnx] add make files for SDK WJH libs * Update arista driver submodule (#8) Make the debian packaging point to a newer kernel version.
Signed-off-by: Guohan Lu <gulv@microsoft.com>
…sonic-net#3032) Increase TMOUT value in order to close inactive serial console connections after 900 seconds (15 minutes) of inactivity
Reduce the retry time for IPV6 connections to avoid reprogramming IPv6 routes after warm-reboot (#37)
sonic-net#3028) * src/iproute2/Makefile * src/python3/Makefile These Makefiles do not properly clean out the src build subdirectory prior to downloading the source code contents. This causes an error during a rebuild following a 'make clean'. Signed-off-by: Greg Paussa <greg.paussa@broadcom.com>
This is a follow-up of sonic-snmpagent PR 92 Now that licensing issues have been solved FRR is distributed with SNMP support compiled-in. This PR adds the last bits of configuration to get the frr-snmp debian packages added to the docker container and the config bits to enable the snmp module in FRR This PR brings the functionality of being able to poll bgpd for routes and peer status. Signed-off-by: Michel Moriniaux <m.moriniaux@criteo.com>
…tart. (sonic-net#2931) - What I did During boot/reload time, wait in a loop to check for bcm initialization. Break the loop, once sdk is ready to process the 'bcmcmd' request (or) loop count reached the maximum value. - How I did it In the existing implementation during syncd start process will sleep for a fixed time (3 secs) for sdk initialization to happen. But the time taken for sdk initialization is varying for different platforms. To fix this issue, the syncd start process wait in a loop and check whether sdk is ready to process 'bcmcmd' command. - How to verify it Check for syncd process status and interface status. Check for syslogs and no failures related to syncd should be present.
Brcm poc changes to include sonic-mgmt-framework docker to sonic-broadcom.bin
update sonic-mgmt-framework submodule branch to master
Also add an option to use docker buildkit for image build Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
Some kernels are built with overlayfs as a builtin and not a module. For these the check via lsmod currently fails. This improvement now checks the kernel configuration for the CONFIG_OVERLAY_FS entry. Depending on the OS and kernel version the build configuration can be in multiple places.
Signed-off-by: Myron Sosyak <msosyak@barefootnetworks.com>
Merged changes 70007e6d2ba3a4c0b371cd693ccc63e0a8906e77..00d4fcfed6a7…
…d' config mode (sonic-net#3045) Signed-off-by: Pavlo Yadvychuk <pyadvychuk@barefootnetworks.com>
- create a dockerfile-marcros.j2 file with all common operations written as j2 macro - use single dockerfile instruction for COPY and RUN commands when possible to improve build time - reorganize dockerfile instructions to make more cache friendly (in case someday we will remove --no-cache to build docker images) Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
…3067) * [build]: wait 60 seconds for docker engine to start On some platforms, it can take more than 1 second for docker engine to start. Signed-off-by: Guohan Lu <gulv@microsoft.com>
…nic-net#2501)" (sonic-net#3060) This reverts commit ed2d87a.
Signed-off-by: Andriy Kokhan <akokhan@barefootnetworks.com>
to include update in mellanox PFCWD lua script matching new SAI sonic-swss: 407d048 [mellanox] convert logic to use quanta in pfc_detect_mellanox.lua (sonic-net#930) 67c0940 [test]: Skip test_clear in test_watermark (sonic-net#937) c72c34f Enable Vnet/Vxlan VS test (sonic-net#935) 4c771d0 add incCrmAclUsedCounter and decCrmAclUsedCounter for SAI_ACL_BIND_POINT_TYPE_SWITCH case. (sonic-net#899) 825c0cb [vs]: Fix bitmap VNET virtual switch test (sonic-net#936) 4577b40 Add buffer pool watermark support (sonic-net#853) 4a67378 Add support of VXLAN tunnel removal (sonic-net#931) Signed-off-by: Stepan Blyschak <stepanb@mellanox.com>
…3040) Signed-off-by: brandon_chuang <brandon_chuang@edge-core.com>
* Update sonic-quagga submodule * Port some patches from sonic-quagga * Fix Makefile * Another patch * Uncomment bgp test * Downport Nikos's patch * Add a patch to alleviate the vendor issue * use patch instead of stg
…s6100 (sonic-net#3065) - What I did Added Daemon to Log LPC bus degradation in Intel C2000 processor. Intel Rangeley C2000 processors with revision less than or equal to 2 have issue where LPC bus degrades over time in some processors. To identify the problem and to notify the issue, a daemon has been added which will log on encountering the issue. - How I did it Added a daemon which validates the CPLD scratch(0x102) and SMF scratch(0x202) registers by writing and reading values on regular polling intervals (300 seconds). If there is a discrepancy between read and write, a critical log will be thrown. - How to verify it The infra is verify by simulating the issue where between write and read, the value in register is modified and the log appearance is checked. - Description for the changelog Added Daemon to identify LPC bus degradation issue and notify using syslog in Dell S6100 and Z9100 platforms. This daemon will only run on processors with revision less than or equal to 2.
…ic-net#3072) Signed-off-by: Jipan Yang <jipan.yang@alibaba-inc.com>
…rom machine.conf (sonic-net#2991) * add code to read base mac from machine.conf * rewording the comments * add mac validation with re * fix review comments * remove empty line
sync from Azure to Project-arlo
Changes to build sonic-mgmt-framework docker
bumped up sonic-mgmt-framework commit-id
* fix fast reboot compatibility We should handle both cases for backward-compatible with 201803: - fast-reboot - SONIC_BOOT_TYPE=fast-reboot * handle review comments * add a comment that getBootType code snippet is shared between two files
fix fast reboot compatibility (sonic-net#3083)
Dell dev changes1
seiferteric
pushed a commit
that referenced
this pull request
Nov 25, 2019
* Update src/sonic-telemetry from branch 'broadcom_sonic' to 31c54a162e0707830cefcad5cf99451c293095f4 - [JIRA SONIC-10470]merge sonic-telemetry dell_sonic --> broadcom_sonic 11112019 Change-Id: I2ae9fe6f9a60937ad178c3a930308ea046cad51e - Merge pull request sonic-net#43 from project-arlo/gnoi_ConfigManagement Add config mgmt gNOI RPCs, rename sonic gNOI proto file - Merge pull request sonic-net#42 from project-arlo/gnoi_techsupport Gnoi techsupport - Add config mgmt gNOI RPCs, rename sonic gNOI proto file - Merge remote-tracking branch 'github/master' into gnoi_techsupport - Merge pull request sonic-net#41 from project-arlo/gnmi_set_prefix Add prefix support to gnmi_set - Merge pull request sonic-net#40 from project-arlo/updates_only Updates only - Merge pull request sonic-net#39 from project-arlo/username_password_support Username password support - Make same changes for show-techsupport proto - Add sonic-tests:sum rpc for example - wip - Initial support for showTechSupport rpc - Add prefix support to gnmi_set - Finish updates_only for poll and once - Move line inside block - Implement updates_only for stream subscriptions - Add authentication to gNOI. Return gRPC erros from PAMAuthenAndAuthor for better error codes - verify username/password is actually sent - Remove file added by accident - Add cmd line arg to enable user/passwd auth - Initial username/password auth support - Merge pull request #36 from project-arlo/gNOI Initial gNOI Support - Merge pull request #37 from project-arlo/jsonSchemaTests Json schema tests - remove debug code - Fix bug with muliple operations reusing path var - Add target option to gNOI client - Get schema for tests from compiled output - Add flag module to gNOI client to support morre rpcs in the future - Remove commented out code - Initial checkin for gNOI, with example System Time rpc - Merge pull request #34 from project-arlo/jsonSchemaTests Json schema tests - Merge pull request #35 from project-arlo/brcm_poc Brcm poc - Merge remote-tracking branch 'broadcom/broadcom_sonic' into brcm_poc - Add cleanup to test cases - Migrate interface ipv4 test to new format - Fix Makefile schema path, ad models, change test format - Fix formatting of json in README - Merge pull request #33 from project-arlo/master Syncing project-arlo/sonic-telmetry master to brcm_poc - typo - Add readme for json schema tests - More changes for Json Schema based tests - Use json schema for get tests as well. Use get test in set to verify results - Go back to local gNMI server - Initial validation support using json schema - Load tests from files and get info from file name - Merge pull request #30 from project-arlo/fix-check-testcase Fix check testcase to check individual attributes in a platform-independent way. - Merge pull request #31 from project-arlo/gnmi_cli_fixes Add check that heartbeat_interval is only valid on streaming query type - Merge remote-tracking branch 'project-arlo-telemetry/brcm_poc' into broadcom_sonic Change-Id: Ia772a55a893c2bee3c9e974700e4821f2f8d7af6 - Add check that heartbeat_interval is only valid on streaming query type - Merge branch 'master' of https://github.com/project-arlo/sonic-telemetry into fix-check-testcase Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com> - Merge pull request #29 from project-arlo/master Dell fixes on telemetry repo - 13th Sep - Merge pull request #28 from project-arlo/tests Disable platform specific test for now - Disable platform specific test for now - Merge pull request #27 from project-arlo/update_tls_config Remove duplicate ciphers - Remove duplicate ciphers - fix the check if value set testcase Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com> - Merge pull request #26 from project-arlo/update_tls_config Update tls config - Update cipher suite list again - Fix spaces to tabs - Set Min TLS Version and cipher suites - Merge remote-tracking branch 'project-arlo-telemetry/brcm_poc' into broadcom_sonic Change-Id: Iae02e417fe8c8ea378a0e85d2354cda10f833b1b - Merge pull request #25 from project-arlo/master merge gnmi_cli code into telemetry repo - Merge pull request #23 from project-arlo/gnmi_cli_fixes Gnmi cli fixes - Merge pull request #24 from project-arlo/brcm_poc Fix low code coverage issue by enabling the gnmi_server test code listening on port 8081 - Fix streaming_type in tests - Merge remote-tracking branch 'project-arlo-telemetry/brcm_poc' into broadcom_sonic Change-Id: I14fb29ab4016f390fab9c930a0af69f9a20eba85 - Merge remote-tracking branch 'sshorigin/master' into gnmi_cli_fixes - Add full code for gnmi_cli with our changes so it can be built from scratch like gnmi_set/get. Update Makefile. Add fixes to gnmi_cli to use seconds as units everywhere instead of nanoseconds, and accept string for -streaming_type - Merge pull request #22 from project-arlo/brcm_poc BRCM changes for Telemetry UT - Merge remote-tracking branch 'project-arlo-telemetry/brcm_poc' into broadcom_sonic Change-Id: I4a0804425a4e0a396870004d717f192354dd19c8 - Merge remote-tracking branch 'project-arlo-telemetry/brcm_poc' into broadcom_sonic Change-Id: Id9f1bef203c4a017d53ce0a854072732656e69ee - Merge remote-tracking branch 'project-arlo-telemetry/brcm_poc' into broadcom_sonic Change-Id: Id9f1bef203c4a017d53ce0a854072732656e69ee - Merge pull request #21 from project-arlo/master bring brcm_poc in par with master - Merge pull request #20 from project-arlo/gnmi-test-after-set Add code to check values set - Add code to check values set Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com> - Merge pull request #19 from project-arlo/gnmi-add-delete-test Minor fix in Delete OC Interface IP testcase - Minor fix in Delete OC Interface IP testcase Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com> - Merge pull request #18 from project-arlo/gnmi-add-delete-test Add delete test case - Add delete testcase Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com> - Merge pull request #17 from project-arlo/gnmi_test_sys_pfm Gnmi Server test for system platform and interfaces - Add json file for ip config Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com> - Working gnmi server test for sys,pfm,interfaces - Add test to set ip address Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com> - Code cleanup in server_test.go Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com> - Fix paths - fix - Fix some issues with test infra - Changes for testing get/set operations on OC interfaces Signed-off-by: Tejaswi Goel <Tejaswi_Goel@Dell.com> - working gnmi sys and pfm test without clearing bad logs - Merge pull request #16 from project-arlo/tests Disable old tests that fail due to new fields being added. Add basic … - Disable old tests that fail due to new fields being added. Add basic interface get test and capabilities test. Change package name and add symlink to cvl schema - Merge pull request #15 from project-arlo/tests Add test directory - Add test directory - Merge pull request #14 from project-arlo/translib-stream-subscribe Implement updates_only for ON_CHANGE streaming mode - Implement updates_only for ON_CHANGE streaming mode - Merge pull request #13 from project-arlo/translib-stream-subscribe Check error response before adding to on_change list - Check error response before adding to on_change list - Merge pull request #12 from project-arlo/capabilities-models Return models based on translib GetModels API - Return models based on translib GetModels API - Merge pull request #11 from project-arlo/translib-stream-subscribe Translib stream subscribe - Fix bug with sync messages - Implement suppress_redundant, fix ticker_map format, remove some debug prints, fix heartbeats - Close channel on error, check if timer if HB - Update IsSupported to IsOnChangeSupported, add heartbeat_interval support to gnmi_cli, remove debug code - Fix issue with when sync message is sent. Add heartbeat support. Add valueCache for suppress_redundant (wip) - convert subscribeResponse to gnmi subscribeResponse and return - wip - Merge pull request #10 from project-arlo/fix-if-replace-update Fix issue with updates and replace with interfaces - Fix issue with updates and replace with interfaces - Merge pull request #9 from project-arlo/sample-subscribe Sample subscribe - Fixes, also include binary for gnmi_cli for now - Add some dummy code for future subscribe api - cleanup - Use ticker_info struct - cleanup - Add paths to existing timer group if interval is the same - Initial support for sample based streaming subscribe - Merge pull request #8 from project-arlo/subscribe-support Ad once channel cleanup - Ad once channel cleanup - Merge pull request #7 from project-arlo/subscribe-support Subscribe support - Add gnmi_cli for subscribe client, update Makefile to build it, add .gitignore - Implement ONCE subscribe mode for translib - Port polling subscriptions code for translib - Merge pull request #6 from project-arlo/buildimage-refactor Fix build issue - Fix build issue - Merge pull request #5 from project-arlo/buildimage-refactor trigger building ocbinds file in translib, add gnmi_clients - trigger building ocbinds file in translib, forgot to add gnmi_clients in last commit - Merge pull request #4 from project-arlo/buildimage-refactor Add gnmi set and get client to build - Add gnmi set and get client to build - Merge pull request #3 from project-arlo/buildimage-refactor Add back install and other targets to fix deb package - Add back install and other targets to fix deb package - Merge pull request #2 from project-arlo/buildimage-refactor Buildimage refactor - Install CVL deps and update gopath - More Makefile changes - Move source files into src, change import paths, fixing Makefile - Merge pull request #1 from project-arlo/brcm_poc Merge PoC changes to master - Ignore test results for gnmi_server The Debian files attempt to run make check for the gNMI server, however, it fails on a build machine, because it expects the Redis server to be available and listening on localhost port 6379. For now, the result of the test is ignored, and we have to find a way to fix this so that the tests work even on a build machine. - GNMI PoC changes
seiferteric
pushed a commit
that referenced
this pull request
Jan 24, 2022
* [BFN] Updated platform APIs impl Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * Extended BFN platform SFP APIs implementation * Update sfp.py * [BFN] Extended SFP platform plugin implementation Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * [BFN] Extended Fans platform plugin implementation * [BFN] divided classes Fan and FanDrawer into 2 files * Signed-off-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> What I did Add get_model() function Add get_low_critical_threshold() function Change __get(...) function. How I did it Differnece from previous implementation of __get(...) function is return real value or -9999.9 if value is not provided by thrift API * Add get_presence() function and revised __get() function Signed-off-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> * [BFN] Updated PSU platform APIs impl Signed-off-by: Dmytro Lytvynenko <dmytrox.lytvynenko@intel.com> * Added BFN PSU cache (#9) Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * [BFN] Fans and Fantray platform APIs update (#7) * [BFN] Updated SFP platform APIs (#10) Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com> * [BFN] Updated platform API for thermal (#8) * Signed-off-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> * Revert "[BFN] Fans and Fantray platform APIs update (#7)" (#11) This reverts commit c62a733. * Add support health monitor system (#15) Signed-off-by: Petro Bratash <petrox.bratash@intel.com> * Update chassis.py * [BFN] Updated FANs and FAN Tray platform API (#14) * Fix fix_alignment (#17) Signed-off-by: Petro Bratash <petrox.bratash@intel.com> * [BFN] Improvement show environment (#16) * Added PSU temperature skip into platform.json (#18) Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * Do not skip psud on Newport Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * [BFN] fix fan status from Not OK to Ok (#19) * [BFN] Updated SFP platform plugin (#13) Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com> * [DPB] Fix typo for Ethernet0 2x200G[100G,40G] breakout mode (#21) Signed-off-by: Mykola Gerasymenko <mykolax.gerasymenko@intel.com> * [barefoot] Tmp fix vendor_rev (#22) Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com> * Fixed python issues in sonic_platform/fan_drawer.py Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * Updated fan_drawer.py * Fixing trailing white spaces in fan_drawer.py * [BFN] Fix thrift for SFPs API Signed-off-by: Volodymyr Boyko <volodymyrx.boiko@intel.com> * In platform.json, replaced 'false' with '0' to workaround ast.literal_eval() issue Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * [Newport] Thermal manager (#23) * Signed-off-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> * Revert "In platform.json, replaced 'false' with '0' to workaround ast.literal_eval() issue" This reverts commit 1e73127. * Removed 'controllable' options from platform.json to fix factory default config generation Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> * Update thermal_manager.py * Migrated SFP plugin to sonic_xcvr API (#30) Signed-off-by: Andriy Kokhan <andriyx.kokhan@intel.com> Co-authored-by: KostiantynYarovyiBf <kostiantynx.yarovyi@intel.com> Co-authored-by: Vadym Yashchenko <vadymx.yashchenko@intel.com> Co-authored-by: Dmytro Lytvynenko <dmytrox.lytvynenko@intel.com> Co-authored-by: Volodymyr Boiko <volodymyrx.boiko@intel.com> Co-authored-by: Petro Bratash <petrox.bratash@intel.com> Co-authored-by: Mykola Gerasymenko <mykolax.gerasymenko@intel.com>
seiferteric
pushed a commit
that referenced
this pull request
Jan 24, 2022
[sonic-linkmgrd][master] submodule update Commits added: 0c23756 Jing Zhang 2022-01-19 Linkmgrd subscribing State DB route event (#13) 12b9951 Longxiang Lyu 2021-12-13 Add TLV support to ICMP payload (#11) 3eedda3 Longxiang Lyu 2022-01-06 Add missing intermediate states (#16) 8da4982 Ying Xie 2022-01-04 [linkmgrd] update README, set coding style guidance (#15) a897cf8 Longxiang Lyu 2021-12-13 Improve PR template (#16) 6fec701 Jing Zhang 2021-12-06 Add pull request template for linkmgrd repo (#9) signed-off-by: Jing Zhang zhangjing@microsoft.com
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
backmerge master to brcm_poc