This is an automated email from the ASF dual-hosted git repository.
github-bot pushed a commit to branch asf-site
in repository https://gitbox.apache.org/repos/asf/nuttx-website.git
The following commit(s) were added to refs/heads/asf-site by this push:
new 3a7d3580 Publishing web: 4b401e13a9490577fa0448cbe8b6d393302e43f3
docs: e89e7eab8d8b23b37b9e8ce048d7d06274e3e696
3a7d3580 is described below
commit 3a7d358043c3039ec741d86673a44603db284712
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Tue Dec 20 00:11:31 2022 +0000
Publishing web: 4b401e13a9490577fa0448cbe8b6d393302e43f3 docs:
e89e7eab8d8b23b37b9e8ce048d7d06274e3e696
---
content/docs/10.0.0/index.html | 2 +-
content/docs/10.0.0/searchindex.js | 2 +-
content/docs/10.0.1/index.html | 2 +-
content/docs/10.0.1/searchindex.js | 2 +-
content/docs/10.1.0/index.html | 2 +-
content/docs/10.1.0/searchindex.js | 2 +-
content/docs/10.2.0/index.html | 2 +-
content/docs/10.2.0/searchindex.js | 2 +-
content/docs/10.3.0/index.html | 2 +-
content/docs/10.3.0/searchindex.js | 2 +-
content/docs/11.0.0/index.html | 2 +-
content/docs/11.0.0/searchindex.js | 2 +-
.../_sources/contributing/making-changes.rst.txt | 132 +++++++++++++++++++++
.../arm/a64/boards/pinephone/index.rst.txt | 1 +
content/docs/latest/contributing/index.html | 1 +
.../docs/latest/contributing/making-changes.html | 117 ++++++++++++++++++
content/docs/latest/index.html | 2 +-
content/docs/latest/objects.inv | Bin 39603 -> 39673 bytes
.../platforms/arm/a64/boards/pinephone/index.html | 6 +-
content/docs/latest/searchindex.js | 2 +-
content/feed.xml | 4 +-
21 files changed, 272 insertions(+), 17 deletions(-)
diff --git a/content/docs/10.0.0/index.html b/content/docs/10.0.0/index.html
index 2bc3492e..c1fa326d 100644
--- a/content/docs/10.0.0/index.html
+++ b/content/docs/10.0.0/index.html
@@ -133,7 +133,7 @@ by following these <a class="reference internal"
href="contributing/documentatio
<section id="nuttx-documentation">
<h1>NuttX Documentation<a class="headerlink" href="#nuttx-documentation"
title="Permalink to this headline"></a></h1>
<p>NuttX is a real-time operating system (RTOS) with an emphasis on standards
compliance and small footprint. Scalable from 8-bit to 32-bit microcontroller
environments, the primary governing standards in NuttX are Posix and ANSI
standards. Additional standard APIs from Unix and other common RTOS’s (such as
VxWorks) are adopted for functionality not available under these standards, or
for functionality that is not appropriate for deeply-embedded environments
(such as fork()).</p>
-<p>Last Updated: 19 December 22 at 00:09</p>
+<p>Last Updated: 20 December 22 at 00:09</p>
<div class="toctree-wrapper compound">
<p class="caption" role="heading"><span class="caption-text">Table of
Contents</span></p>
<ul class="current">
diff --git a/content/docs/10.0.0/searchindex.js
b/content/docs/10.0.0/searchindex.js
index 70820696..8cd1caff 100644
--- a/content/docs/10.0.0/searchindex.js
+++ b/content/docs/10.0.0/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["applications/index","boards/index","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/index","components/drivers/character/keypad","components/drivers/character/pwm","components/drivers/character/quadrature","components/drivers/character/rtc","components/drivers/character/serial","components/drivers/character/timer","components/drivers/character/touchscreen
[...]
\ No newline at end of file
+Search.setIndex({docnames:["applications/index","boards/index","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/index","components/drivers/character/keypad","components/drivers/character/pwm","components/drivers/character/quadrature","components/drivers/character/rtc","components/drivers/character/serial","components/drivers/character/timer","components/drivers/character/touchscreen
[...]
\ No newline at end of file
diff --git a/content/docs/10.0.1/index.html b/content/docs/10.0.1/index.html
index fd0aaf14..d7611e93 100644
--- a/content/docs/10.0.1/index.html
+++ b/content/docs/10.0.1/index.html
@@ -145,7 +145,7 @@ by following these <a class="reference internal"
href="contributing/documentatio
<section id="nuttx-documentation">
<h1>NuttX Documentation<a class="headerlink" href="#nuttx-documentation"
title="Permalink to this headline"></a></h1>
<p>NuttX is a real-time operating system (RTOS) with an emphasis on standards
compliance and small footprint. Scalable from 8-bit to 32-bit microcontroller
environments, the primary governing standards in NuttX are Posix and ANSI
standards. Additional standard APIs from Unix and other common RTOS’s (such as
VxWorks) are adopted for functionality not available under these standards, or
for functionality that is not appropriate for deeply-embedded environments
(such as fork()).</p>
-<p>Last Updated: 19 December 22 at 00:09</p>
+<p>Last Updated: 20 December 22 at 00:09</p>
<div class="toctree-wrapper compound">
<p class="caption" role="heading"><span class="caption-text">Table of
Contents</span></p>
<ul class="current">
diff --git a/content/docs/10.0.1/searchindex.js
b/content/docs/10.0.1/searchindex.js
index 70820696..8cd1caff 100644
--- a/content/docs/10.0.1/searchindex.js
+++ b/content/docs/10.0.1/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["applications/index","boards/index","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/index","components/drivers/character/keypad","components/drivers/character/pwm","components/drivers/character/quadrature","components/drivers/character/rtc","components/drivers/character/serial","components/drivers/character/timer","components/drivers/character/touchscreen
[...]
\ No newline at end of file
+Search.setIndex({docnames:["applications/index","boards/index","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/index","components/drivers/character/keypad","components/drivers/character/pwm","components/drivers/character/quadrature","components/drivers/character/rtc","components/drivers/character/serial","components/drivers/character/timer","components/drivers/character/touchscreen
[...]
\ No newline at end of file
diff --git a/content/docs/10.1.0/index.html b/content/docs/10.1.0/index.html
index 26d91b6f..9fa8f9e0 100644
--- a/content/docs/10.1.0/index.html
+++ b/content/docs/10.1.0/index.html
@@ -144,7 +144,7 @@ by following these <a class="reference internal"
href="contributing/documentatio
<section id="nuttx-documentation">
<h1>NuttX Documentation<a class="headerlink" href="#nuttx-documentation"
title="Permalink to this headline"></a></h1>
<p>NuttX is a real-time operating system (RTOS) with an emphasis on standards
compliance and small footprint. Scalable from 8-bit to 64-bit microcontroller
environments, the primary governing standards in NuttX are POSIX and ANSI
standards. Additional standard APIs from Unix and other common RTOS’s (such as
VxWorks) are adopted for functionality not available under these standards, or
for functionality that is not appropriate for deeply-embedded environments
(such as fork()).</p>
-<p>Last Updated: 19 December 22 at 00:10</p>
+<p>Last Updated: 20 December 22 at 00:09</p>
<div class="toctree-wrapper compound">
<p class="caption" role="heading"><span class="caption-text">Table of
Contents</span></p>
<ul class="current">
diff --git a/content/docs/10.1.0/searchindex.js
b/content/docs/10.1.0/searchindex.js
index b7ea5c1e..6781286c 100644
--- a/content/docs/10.1.0/searchindex.js
+++ b/content/docs/10.1.0/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
+Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
diff --git a/content/docs/10.2.0/index.html b/content/docs/10.2.0/index.html
index 7204a143..07b5d754 100644
--- a/content/docs/10.2.0/index.html
+++ b/content/docs/10.2.0/index.html
@@ -145,7 +145,7 @@ by following these <a class="reference internal"
href="contributing/documentatio
<section id="nuttx-documentation">
<h1>NuttX Documentation<a class="headerlink" href="#nuttx-documentation"
title="Permalink to this headline"></a></h1>
<p>NuttX is a real-time operating system (RTOS) with an emphasis on standards
compliance and small footprint. Scalable from 8-bit to 64-bit microcontroller
environments, the primary governing standards in NuttX are POSIX and ANSI
standards. Additional standard APIs from Unix and other common RTOS’s (such as
VxWorks) are adopted for functionality not available under these standards, or
for functionality that is not appropriate for deeply-embedded environments
(such as fork()).</p>
-<p>Last Updated: 19 December 22 at 00:10</p>
+<p>Last Updated: 20 December 22 at 00:09</p>
<div class="toctree-wrapper compound">
<p class="caption" role="heading"><span class="caption-text">Table of
Contents</span></p>
<ul class="current">
diff --git a/content/docs/10.2.0/searchindex.js
b/content/docs/10.2.0/searchindex.js
index 2015b51d..6632454e 100644
--- a/content/docs/10.2.0/searchindex.js
+++ b/content/docs/10.2.0/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
+Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
diff --git a/content/docs/10.3.0/index.html b/content/docs/10.3.0/index.html
index 7204a143..c687057d 100644
--- a/content/docs/10.3.0/index.html
+++ b/content/docs/10.3.0/index.html
@@ -145,7 +145,7 @@ by following these <a class="reference internal"
href="contributing/documentatio
<section id="nuttx-documentation">
<h1>NuttX Documentation<a class="headerlink" href="#nuttx-documentation"
title="Permalink to this headline"></a></h1>
<p>NuttX is a real-time operating system (RTOS) with an emphasis on standards
compliance and small footprint. Scalable from 8-bit to 64-bit microcontroller
environments, the primary governing standards in NuttX are POSIX and ANSI
standards. Additional standard APIs from Unix and other common RTOS’s (such as
VxWorks) are adopted for functionality not available under these standards, or
for functionality that is not appropriate for deeply-embedded environments
(such as fork()).</p>
-<p>Last Updated: 19 December 22 at 00:10</p>
+<p>Last Updated: 20 December 22 at 00:10</p>
<div class="toctree-wrapper compound">
<p class="caption" role="heading"><span class="caption-text">Table of
Contents</span></p>
<ul class="current">
diff --git a/content/docs/10.3.0/searchindex.js
b/content/docs/10.3.0/searchindex.js
index c53b3d97..ed0f0e66 100644
--- a/content/docs/10.3.0/searchindex.js
+++ b/content/docs/10.3.0/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
+Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
diff --git a/content/docs/11.0.0/index.html b/content/docs/11.0.0/index.html
index 92a459be..c687057d 100644
--- a/content/docs/11.0.0/index.html
+++ b/content/docs/11.0.0/index.html
@@ -145,7 +145,7 @@ by following these <a class="reference internal"
href="contributing/documentatio
<section id="nuttx-documentation">
<h1>NuttX Documentation<a class="headerlink" href="#nuttx-documentation"
title="Permalink to this headline"></a></h1>
<p>NuttX is a real-time operating system (RTOS) with an emphasis on standards
compliance and small footprint. Scalable from 8-bit to 64-bit microcontroller
environments, the primary governing standards in NuttX are POSIX and ANSI
standards. Additional standard APIs from Unix and other common RTOS’s (such as
VxWorks) are adopted for functionality not available under these standards, or
for functionality that is not appropriate for deeply-embedded environments
(such as fork()).</p>
-<p>Last Updated: 19 December 22 at 00:11</p>
+<p>Last Updated: 20 December 22 at 00:10</p>
<div class="toctree-wrapper compound">
<p class="caption" role="heading"><span class="caption-text">Table of
Contents</span></p>
<ul class="current">
diff --git a/content/docs/11.0.0/searchindex.js
b/content/docs/11.0.0/searchindex.js
index 9863ae45..bf38ae7e 100644
--- a/content/docs/11.0.0/searchindex.js
+++ b/content/docs/11.0.0/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
+Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
diff --git a/content/docs/latest/_sources/contributing/making-changes.rst.txt
b/content/docs/latest/_sources/contributing/making-changes.rst.txt
index 93865d76..7198081a 100644
--- a/content/docs/latest/_sources/contributing/making-changes.rst.txt
+++ b/content/docs/latest/_sources/contributing/making-changes.rst.txt
@@ -211,6 +211,138 @@ squash before submitting the Pull Request:
happy, they may suggest squashing and merging again to make a single
commit. In this case you would repeat steps
1 through 6.
+How to Include the Suggestions on Your Pull Request?
+----------------------------------------------------
+
+If you submitted your first PR (Pull Request) and received some feedbacks
+to modify your commit, then probably you already modified it and created a
+new commit with these modifications and submitted it.
+
+Also probably you saw that this new commit appeared on your Pull Request at
+NuttX's github page (at Commits tab).
+
+So, someone will ask you some enigmatic thing: "Please rebase and squash these
commits!"
+
+Basically what they are saying is that you need to update your repository
+and fuse your commits in a single commit.
+
+Let walk through the steps to do it!
+
+Move to upstream branch and pull the new commits from there:
+
+ .. code-block:: bash
+
+ $ git checkout upstream
+ $ git pull
+
+Return to your working branch and rebase it with upstream:
+
+ .. code-block:: bash
+
+ $ git checkout my-branch
+ $ git rebase upstream
+
+If you run git log will see that your commits still there:
+
+
+ .. code-block:: bash
+
+ $ git log
+ commit xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (HEAD -> firstpr,
upstream/master, upstream)
+
+ Author: Me Myself
+ Date: Today few seconds ago
+
+ Fix suggestions from mainline
+
+ commit xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+ Author: Me Myself
+ Date: Today few minutes ago
+
+ Initial support for something fantastic
+
+ commit 6aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ Author: Xiang Xiao <xiaoxi...@xiaomi.com>
+ Date: Sun Dec 18 00:00:00 2022 +0800
+
+ Some existing commit from mainline
+
+See, you have two commits (Fix suggestions... and Initial support...), we can
squash both in a single commit!
+
+You can use the git rebase interactive command to squash both commits:
+
+
+ .. code-block:: bash
+
+ $ git rebase -i HEAD~2
+
+Note: case you had 3 commits, then you should replace HEAD~2 with HEAD~3 and
so on.
+
+This command will open the nano editor with this screen:
+
+
+ .. code-block:: bash
+
+ pick 10ef3900b2 Initial support for something fantastic
+ pick 9431582586 Fix suggestions from mainline
+
+ # Rebase 9b0e1659ea..9431582586 onto 9b0e1659ea (2 commands)
+ #
+ # Commands:
+ # p, pick <commit> = use commit
+ ...
+
+Here you can control the actions that git will execute over your commits.
+
+Because we want to squash the second commit with the first you need to
+replace the 'pick' of the second line with a 'squash' (or just a 's') this way:
+
+
+ .. code-block:: bash
+
+ pick 10ef3900b2 Initial support for something fantastic
+ squash 9431582586 Fix suggestions from mainline
+
+ # Rebase 9b0e1659ea..9431582586 onto 9b0e1659ea (2 commands)
+ #
+ # Commands:
+ # p, pick <commit> = use commit
+ ...
+
+Now just press `Ctrl + X` to save this modification. In the next screen you
can edit your git
+commit messages. After that press Ctrl + X again to save.
+
+If you run git log again will see that now there is one a single commit:
+
+
+ .. code-block:: bash
+
+ $ git log
+ commit xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx (HEAD -> firstpr,
upstream/master, upstream)
+ Author: Me Myself
+ Date: Right now baby, right now
+
+ Initial support for something fantastic
+
+ This commit includes the suggestions from mainline
+
+ commit 6aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+ Author: Xiang Xiao <xiaoxi...@xiaomi.com>
+ Date: Sun Dec 18 00:00:00 2022 +0800
+
+ Some existing commit from mainline
+
+Just push forced this new commit to your repository:
+
+
+ .. code-block:: bash
+
+ $ git push -f
+
+Now you can look at your PR at NuttX's github to confirm that
+this squashed commit is there.
+
Git Resources
-------------
diff --git
a/content/docs/latest/_sources/platforms/arm/a64/boards/pinephone/index.rst.txt
b/content/docs/latest/_sources/platforms/arm/a64/boards/pinephone/index.rst.txt
index e0c22c01..aa48e5f4 100644
---
a/content/docs/latest/_sources/platforms/arm/a64/boards/pinephone/index.rst.txt
+++
b/content/docs/latest/_sources/platforms/arm/a64/boards/pinephone/index.rst.txt
@@ -148,5 +148,6 @@ Peripheral Support NOTES
MIPI D-PHY Yes
MIPI DSI Yes
PIO Yes
+TCON0 Yes
UART Yes Only UART0 is supported
=========== ======= =====
diff --git a/content/docs/latest/contributing/index.html
b/content/docs/latest/contributing/index.html
index 1752408e..1d8d2258 100644
--- a/content/docs/latest/contributing/index.html
+++ b/content/docs/latest/contributing/index.html
@@ -148,6 +148,7 @@ and documentation (the one you are reading now):</p>
<li class="toctree-l1"><a class="reference internal"
href="making-changes.html">Making Changes Using Git</a><ul>
<li class="toctree-l2"><a class="reference internal"
href="making-changes.html#git-workflow-with-an-upstream-repository">Git
Workflow With an Upstream Repository</a></li>
<li class="toctree-l2"><a class="reference internal"
href="making-changes.html#submitting-your-changes-to-nuttx">Submitting Your
Changes to NuttX</a></li>
+<li class="toctree-l2"><a class="reference internal"
href="making-changes.html#how-to-include-the-suggestions-on-your-pull-request">How
to Include the Suggestions on Your Pull Request?</a></li>
<li class="toctree-l2"><a class="reference internal"
href="making-changes.html#git-resources">Git Resources</a></li>
</ul>
</li>
diff --git a/content/docs/latest/contributing/making-changes.html
b/content/docs/latest/contributing/making-changes.html
index 316f4db0..751a66bc 100644
--- a/content/docs/latest/contributing/making-changes.html
+++ b/content/docs/latest/contributing/making-changes.html
@@ -102,6 +102,7 @@
<li class="toctree-l2 current"><a class="current reference internal"
href="#">Making Changes Using Git</a><ul>
<li class="toctree-l3"><a class="reference internal"
href="#git-workflow-with-an-upstream-repository">Git Workflow With an Upstream
Repository</a></li>
<li class="toctree-l3"><a class="reference internal"
href="#submitting-your-changes-to-nuttx">Submitting Your Changes to
NuttX</a></li>
+<li class="toctree-l3"><a class="reference internal"
href="#how-to-include-the-suggestions-on-your-pull-request">How to Include the
Suggestions on Your Pull Request?</a></li>
<li class="toctree-l3"><a class="reference internal" href="#git-resources">Git
Resources</a></li>
</ul>
</li>
@@ -355,6 +356,122 @@ happy, they may suggest squashing and merging again to
make a single commit. In
</li>
</ol>
</section>
+<section id="how-to-include-the-suggestions-on-your-pull-request">
+<h2>How to Include the Suggestions on Your Pull Request?<a class="headerlink"
href="#how-to-include-the-suggestions-on-your-pull-request" title="Permalink to
this headline"></a></h2>
+<p>If you submitted your first PR (Pull Request) and received some feedbacks
+to modify your commit, then probably you already modified it and created a
+new commit with these modifications and submitted it.</p>
+<p>Also probably you saw that this new commit appeared on your Pull Request at
+NuttX’s github page (at Commits tab).</p>
+<p>So, someone will ask you some enigmatic thing: “Please rebase and squash
these commits!”</p>
+<p>Basically what they are saying is that you need to update your repository
+and fuse your commits in a single commit.</p>
+<p>Let walk through the steps to do it!</p>
+<p>Move to upstream branch and pull the new commits from there:</p>
+<blockquote>
+<div><div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span>$ git checkout upstream
+$ git pull
+</pre></div>
+</div>
+</div></blockquote>
+<p>Return to your working branch and rebase it with upstream:</p>
+<blockquote>
+<div><div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span>$ git checkout my-branch
+$ git rebase upstream
+</pre></div>
+</div>
+</div></blockquote>
+<p>If you run git log will see that your commits still there:</p>
+<blockquote>
+<div><div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span>$ git log
+commit xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx <span class="o">(</span>HEAD
-> firstpr, upstream/master, upstream<span class="o">)</span>
+
+Author: Me Myself
+Date: Today few seconds ago
+
+Fix suggestions from mainline
+
+commit xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+Author: Me Myself
+Date: Today few minutes ago
+
+Initial support <span class="k">for</span> something fantastic
+
+commit 6aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+Author: Xiang Xiao <xiaoxi...@xiaomi.com>
+Date: Sun Dec <span class="m">18</span> <span class="m">00</span>:00:00
<span class="m">2022</span> +0800
+
+Some existing commit from mainline
+</pre></div>
+</div>
+</div></blockquote>
+<p>See, you have two commits (Fix suggestions… and Initial support…), we can
squash both in a single commit!</p>
+<p>You can use the git rebase interactive command to squash both commits:</p>
+<blockquote>
+<div><div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span>$ git rebase -i HEAD~2
+</pre></div>
+</div>
+</div></blockquote>
+<p>Note: case you had 3 commits, then you should replace HEAD~2 with HEAD~3
and so on.</p>
+<p>This command will open the nano editor with this screen:</p>
+<blockquote>
+<div><div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span>pick 10ef3900b2 Initial support <span
class="k">for</span> something fantastic
+pick <span class="m">9431582586</span> Fix suggestions from mainline
+
+<span class="c1"># Rebase 9b0e1659ea..9431582586 onto 9b0e1659ea (2
commands)</span>
+<span class="c1">#</span>
+<span class="c1"># Commands:</span>
+<span class="c1"># p, pick <commit> = use commit</span>
+...
+</pre></div>
+</div>
+</div></blockquote>
+<p>Here you can control the actions that git will execute over your
commits.</p>
+<p>Because we want to squash the second commit with the first you need to
+replace the ‘pick’ of the second line with a ‘squash’ (or just a ‘s’) this
way:</p>
+<blockquote>
+<div><div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span>pick 10ef3900b2 Initial support <span
class="k">for</span> something fantastic
+squash <span class="m">9431582586</span> Fix suggestions from mainline
+
+<span class="c1"># Rebase 9b0e1659ea..9431582586 onto 9b0e1659ea (2
commands)</span>
+<span class="c1">#</span>
+<span class="c1"># Commands:</span>
+<span class="c1"># p, pick <commit> = use commit</span>
+...
+</pre></div>
+</div>
+</div></blockquote>
+<p>Now just press <cite>Ctrl + X</cite> to save this modification. In the next
screen you can edit your git
+commit messages. After that press Ctrl + X again to save.</p>
+<p>If you run git log again will see that now there is one a single commit:</p>
+<blockquote>
+<div><div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span>$ git log
+commit xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx <span class="o">(</span>HEAD
-> firstpr, upstream/master, upstream<span class="o">)</span>
+Author: Me Myself
+Date: Right now baby, right now
+
+Initial support <span class="k">for</span> something fantastic
+
+This commit includes the suggestions from mainline
+
+commit 6aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+Author: Xiang Xiao <xiaoxi...@xiaomi.com>
+Date: Sun Dec <span class="m">18</span> <span class="m">00</span>:00:00
<span class="m">2022</span> +0800
+
+Some existing commit from mainline
+</pre></div>
+</div>
+</div></blockquote>
+<p>Just push forced this new commit to your repository:</p>
+<blockquote>
+<div><div class="highlight-bash notranslate"><div
class="highlight"><pre><span></span>$ git push -f
+</pre></div>
+</div>
+</div></blockquote>
+<p>Now you can look at your PR at NuttX’s github to confirm that
+this squashed commit is there.</p>
+</section>
<section id="git-resources">
<h2>Git Resources<a class="headerlink" href="#git-resources" title="Permalink
to this headline"></a></h2>
<ul class="simple">
diff --git a/content/docs/latest/index.html b/content/docs/latest/index.html
index d3f91948..065530b8 100644
--- a/content/docs/latest/index.html
+++ b/content/docs/latest/index.html
@@ -145,7 +145,7 @@ by following these <a class="reference internal"
href="contributing/documentatio
<section id="nuttx-documentation">
<h1>NuttX Documentation<a class="headerlink" href="#nuttx-documentation"
title="Permalink to this headline"></a></h1>
<p>NuttX is a real-time operating system (RTOS) with an emphasis on standards
compliance and small footprint. Scalable from 8-bit to 64-bit microcontroller
environments, the primary governing standards in NuttX are POSIX and ANSI
standards. Additional standard APIs from Unix and other common RTOS’s (such as
VxWorks) are adopted for functionality not available under these standards, or
for functionality that is not appropriate for deeply-embedded environments
(such as fork()).</p>
-<p>Last Updated: 19 December 22 at 00:11</p>
+<p>Last Updated: 20 December 22 at 00:10</p>
<div class="toctree-wrapper compound">
<p class="caption" role="heading"><span class="caption-text">Table of
Contents</span></p>
<ul class="current">
diff --git a/content/docs/latest/objects.inv b/content/docs/latest/objects.inv
index 64aa24df..fef9be64 100644
Binary files a/content/docs/latest/objects.inv and
b/content/docs/latest/objects.inv differ
diff --git a/content/docs/latest/platforms/arm/a64/boards/pinephone/index.html
b/content/docs/latest/platforms/arm/a64/boards/pinephone/index.html
index 7e3af612..fd3ce052 100644
--- a/content/docs/latest/platforms/arm/a64/boards/pinephone/index.html
+++ b/content/docs/latest/platforms/arm/a64/boards/pinephone/index.html
@@ -333,7 +333,11 @@ Serial Console is enabled on UART0 at 115.2 kbps.</p>
<td><p>Yes</p></td>
<td></td>
</tr>
-<tr class="row-odd"><td><p>UART</p></td>
+<tr class="row-odd"><td><p>TCON0</p></td>
+<td><p>Yes</p></td>
+<td></td>
+</tr>
+<tr class="row-even"><td><p>UART</p></td>
<td><p>Yes</p></td>
<td><p>Only UART0 is supported</p></td>
</tr>
diff --git a/content/docs/latest/searchindex.js
b/content/docs/latest/searchindex.js
index cb06f8f6..3b683707 100644
--- a/content/docs/latest/searchindex.js
+++ b/content/docs/latest/searchindex.js
@@ -1 +1 @@
-Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
+Search.setIndex({docnames:["applications/index","applications/nsh/builtin","applications/nsh/commands","applications/nsh/config","applications/nsh/customizing","applications/nsh/index","applications/nsh/installation","applications/nsh/login","applications/nsh/nsh","components/binfmt","components/drivers/block/index","components/drivers/character/analog","components/drivers/character/can","components/drivers/character/foc","components/drivers/character/index","components/drivers/character
[...]
\ No newline at end of file
diff --git a/content/feed.xml b/content/feed.xml
index 45e4406f..3b42d3eb 100644
--- a/content/feed.xml
+++ b/content/feed.xml
@@ -5,8 +5,8 @@
<description></description>
<link>/</link>
<atom:link href="/feed.xml" rel="self" type="application/rss+xml"/>
- <pubDate>Mon, 19 Dec 2022 00:12:19 +0000</pubDate>
- <lastBuildDate>Mon, 19 Dec 2022 00:12:19 +0000</lastBuildDate>
+ <pubDate>Tue, 20 Dec 2022 00:11:29 +0000</pubDate>
+ <lastBuildDate>Tue, 20 Dec 2022 00:11:29 +0000</lastBuildDate>
<generator>Jekyll v3.9.2</generator>
<item>
