Merge branch 'main' of https://github.com/dawood87/FreeRTOS-Kernel

.github/CONTRIBUTING.md

@@ -17,13 +17,21 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Submitting a bugs/feature request
 Have a bug to report or feature to request? Follow these steps:
+<<<<<<< HEAD
 1. Search on the [FreeRTOS Community Support Forums](https://forums.freertos.org/) and [GitHub issue tracker](https://github.com/FreeRTOS/FreeRTOS/issues?utf8=%E2%9C%93&q=is%3Aissue) to be sure this hasn't been already reported or discussed.
+=======
+1. Search on the [FreeRTOS Community Support Forums](https://forums.freertos.org/) and [GitHub issue tracker](https://github.com/FreeRTOS/FreeRTOS/issues?utf8=%E2%9C%93&q=is%3Aissue) to be sure this hasn't been already reported or discussed. 
+>>>>>>> origin/smp
 2. If your search turns up empty, create a new topic in the [forums](https://forums.freertos.org/) and work with the community to help clarify issues or refine the idea. Include as many of the details listed below.
 3. Once the community has had time to discuss and digest, we welcome you to create an [issue](https://github.com/FreeRTOS/FreeRTOS/issues) to report bugs or suggest features.
 
 When creating a new topic on the forums or filing an issue, please include as many relevant details as possible. Examples include:
 
+<<<<<<< HEAD
 * A clear description of the situation - what you observe, what you expect, and your view on how the two differ.
+=======
+* A clear description of the situation — what you observe, what you expect, and your view on how the two differ.
+>>>>>>> origin/smp
 * A reproducible test case or sequence of steps.
 * The version of our code being used.
 * Any modifications you've made relevant to the bug.
@@ -33,7 +41,11 @@ When creating a new topic on the forums or filing an issue, please include as ma
 ## Contributing via pull request
 Contributions via pull requests are much appreciated. Before sending us a pull request, please ensure that:
 
+<<<<<<< HEAD
 1. You are working against the latest source on the *main* branch.
+=======
+1. You are working against the latest source on the *master* branch.
+>>>>>>> origin/smp
 2. You check existing open, and recently merged, pull requests to make sure someone else hasn't addressed the problem already.
 3. You open an issue to discuss any significant work - we would hate for your time to be wasted.
 
@@ -43,8 +55,13 @@ To send us a pull request, please:
 2. Modify the source; focus on the specific change you are contributing. If you also reformat all the code, it will be hard for us to focus on your change.
 3. Follow the [coding style guide](https://www.FreeRTOS.org/FreeRTOS-Coding-Standard-and-Style-Guide.html).
 4. Commit to your fork using clear commit messages.
+<<<<<<< HEAD
 5. Send us a pull request, answering any default questions in the pull request interface.
    NOTE: Please make sure the default option (Allow edits from maintainers) is left checked.
+=======
+5. Send us a pull request, answering any default questions in the pull request interface.    
+   NOTE: Please make sure the default option (Allow edits from maintainers) is left checked.    
+>>>>>>> origin/smp
 6. Pay attention to any automated CI failures reported in the pull request, and stay involved in the conversation.
 
 GitHub provides additional document on [forking a repository](https://help.github.com/articles/fork-a-repo/) and
@@ -63,7 +80,11 @@ Looking at the existing issues is a great way to find something to contribute on
 
 
 ## Licensing
+<<<<<<< HEAD
 The FreeRTOS kernel is released under the MIT open source license, the text of which can be found [here](https://github.com/FreeRTOS/FreeRTOS/blob/main/FreeRTOS/License/license.txt)
+=======
+The FreeRTOS kernel is released under the MIT open source license, the text of which can be found [here](https://github.com/FreeRTOS/FreeRTOS/blob/master/FreeRTOS/License/license.txt)
+>>>>>>> origin/smp
 
 Additional license files can be found in the folders containing any supplementary libraries licensed by their respective copyright owners where applicable.
 

.github/scripts/kernel_checker.py

@@ -62,6 +62,7 @@
     '.sh',
     '.txt',
     '.cmake'
+<<<<<<< HEAD
 ]
 
 KERNEL_ASM_EXTENSIONS = [
@@ -81,6 +82,8 @@
 
 KERNEL_PY_EXTENSIONS = [
     '.py'
+=======
+>>>>>>> origin/smp
 ]
 
 KERNEL_IGNORED_PATTERNS = [
@@ -99,10 +102,15 @@
 
 KERNEL_HEADER = [
     '/*\n',
+<<<<<<< HEAD
     ' * FreeRTOS Kernel <DEVELOPMENT BRANCH>\n',
     ' * Copyright (C) 2021 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\n',
     ' *\n',
     ' * SPDX-License-Identifier: MIT\n',
+=======
+    ' * FreeRTOS SMP Kernel V202110.00\n',
+    ' * Copyright (C) 2020 Amazon.com, Inc. or its affiliates.  All Rights Reserved.\n',
+>>>>>>> origin/smp
     ' *\n',
     ' * Permission is hereby granted, free of charge, to any person obtaining a copy of\n',
     ' * this software and associated documentation files (the "Software"), to deal in\n',

.gitignore

@@ -0,0 +1,24 @@
+# Ignore build results
+[Bb]uild/
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+[Bb]in/
+[Oo]bj/
+[Ll]og/
+[Ll]ogs/
+
+# Visual Studio cache/options directory
+.vs/
+
+# Python Tools for Visual Studio (PTVS)
+__pycache__/
+*.pyc
+
+# Ignore certificate files.
+*.pem
+*.crt
+*.txt
+*.txt
+portable/ThirdParty/XCC/Xtensa/Makefile