Merge branch 'master' into add_session_chairs

Signed-off-by: bbrcknl <32238793+bbrcknl@users.noreply.github.com>

Foundation/Summit/2024/index.html

@@ -26,13 +26,7 @@ <h4>
     <li><a href="#summit-program">Program & Abstracts</a></li>
     <li><a href="#summit-keynote-speakers">Keynote Speakers</a></li>
     <!-- li><a href="#summit-panellists">Panellists</a></li>-->
-<<<<<<< HEAD
     <li><a class="highlight" href="#summit-training-day">Latest news: Training day @ UNSW</a></li>
-=======
-    <li><a class="highlight" href="#summit-program">Latest news: Program & Abstracts</a></li>
-    <!--li><a href="#summit-keynote-speakers">Keynote Speakers</a></li>
-    <li><a href="#summit-panellists">Panellists</a></li-->
->>>>>>> 88fc5d9 (resolve merge conflicts)
     <li><a href="#summit-pc">Program Committee</a></li>
     <li><a href="#summit-sponsors">Sponsors</a></li>
     <li><a href="#summit-contact">Contact</a></li>
@@ -117,24 +111,6 @@ <h3 id="summit-location">
   </p>
 </div>
 
-<<<<<<< HEAD
-=======
-
-<div class="summit_div">
-  <h3 id="summit-program">
-    Program & Abstracts
-  </h3>
-  <p>
-    Check out the summit <a href="program">Program</a> and <a href="abstracts2024">Abstracts</a> for our list of speakers and presentations.
-  </p>
-  <p>
-  <p>
-    See the <a href="https://events.linuxfoundation.org/sel4-summit/program/schedule/">Schedule</a> on LF Events.
-  </p>
-</div>
-
-
->>>>>>> 88fc5d9 (resolve merge conflicts)
 <div class="summit_div">
   <h3 id="summit-cfp">
     Submissions and Call for Presentations
@@ -158,6 +134,7 @@ <h3 id="summit-program">
 </div>
 
 
+
 <div class="summit_div">
   <h3 id="summit-keynote-speakers">
     Keynote Speakers
@@ -197,7 +174,6 @@ <h3 id="summit-keynote-speakers">
 </div>
 
 
-<<<<<<< HEAD
 <div class="summit_div">
   <h3 id="summit-training-day">
     Training day @ UNSW
@@ -269,8 +245,77 @@ <h4>Using Rust in seL4 Userspace</h4>
 </div>
 
 
-=======
->>>>>>> 88fc5d9 (resolve merge conflicts)
+<div class="summit_div">
+  <h3 id="summit-training-day">
+    Training day @ UNSW
+  </h3>
+  <p>
+    18 October 2024
+  </p>
+  <p>
+    <a href="https://www.learningenvironments.unsw.edu.au/physical-spaces/electrical-engineering-bldg/k-g17-g10-electrical-engineering-g10">Room G10 in the Electrical Engineering Building</a>
+  </p>
+  <h4 style="padding-top:10px">Registration for training day</h4>
+  <p>
+    <a href="https://form.jotform.com/242312058251850">Register for the LionsOS, Rust or both tutorials</a>
+  </p>
+  <p>
+      Training day @ UNSW is free, but please register by <span class="highlight"> 15 September 2024</span> so that we can account for numbers. Lunch is not included but there are plenty of <a href="https://www.estate.unsw.edu.au/food-retail/explore">coffee and food outlets</a> on campus.
+    </p>
+  <div id="a-lions" style="padding-top:20px">
+    <h4>Using LionsOS</h4>
+    <p>
+      <span class="summit-abstract-presenter">Ivan Velickovic</span>,
+      <span class="summit-abstract-affiliation">UNSW Sydney</span>
+    </p>
+    <p>
+      10:00 - 12:30
+    </p>
+    <p>
+      LionsOS is a new Operating Systems developed at Trustworthy Systems aimed at embedded, IoT, and cyberphysical systems. LionsOS is based on the seL4 Microkit and is desgined to formally verifiable, performant, and adaptable to a wide class of use-cases.
+    </p>
+    <p>
+      LionsOS, by design, is not a conventional OS and hence it may be overwhelming for users who want to get started and are not familiar with the ideas and goals of LionsOS.
+    </p>
+    <p>
+      This hands-on tutorial aims to ease people into creating a LionsOS-based system. We will be using the components and tools provided by LionsOS to, step-by-step, transform a minimal boilerplate system to a functional system involving various drivers, virtual machines and other components.
+    </p>
+    <p>
+      See the training in the <a href="program#p-lions">program</a>.
+    </p>
+    <p>What to bring:</p>
+    <ul>
+      <li>Your own laptop</li>
+    </ul>
+  </div>
+  <div id="a-rust" style="padding-top:20px">
+    <h4>Using Rust in seL4 Userspace</h4>
+    <p>
+      <span class="summit-abstract-presenter">Nick Spinale</span>,
+      <span class="summit-abstract-affiliation">Colias Group, LLC</span>
+    </p>
+    <p>
+      14:00 - 16:30
+    </p>
+    <p>
+      <a href="https://www.rust-lang.org/">
+        <img src="../../../images/rust-logo-blk.svg"
+        style="width: 20%;  padding-left:10px;  float:right"
+        alt="Rust logo" />
+      </a>
+      Rust has been an officially supported language for use in seL4 userspace since last year's summit. In this workshop, participants will be led through a tutorial that demonstrates how to leverage Rust and its ecosystem to rapidly build memory-safe components for seL4-based systems. This tutorial will cover a range of scenarios, including <a href="https://docs.sel4.systems/projects/microkit/">Microkit</a> protection domains as well as building on seL4 directly.
+    </p>
+    <p>
+      See the training in the <a href="program#p-rust">program</a>.
+    </p>
+    <p>What to bring:</p>
+    <ul>
+      <li>Your own laptop with <a href="https://www.docker.com/">Docker</a> installed.</li>
+    </ul>
+  </div>
+</div>
+
+
 <div class="summit_div">
   <h3 id="summit-pc">
     Program Committee

Foundation/Summit/2024/program.html

@@ -378,14 +378,13 @@ <h4>Summit</h4>
     </td>
   </tr>
   <tr>
-    <th colspan="4">Day 4&emsp;18 October 2024&emsp;Training day @ UNSW (TBC)&emsp;</th>
+    <th colspan="4">Day 4&emsp;18 October 2024&emsp;Training day @ UNSW&emsp;</th>
   </tr>
   <tr id="p-lions">
     <td>10:00 - 12:30</td>
     <td>Training</td>
     <td><a href="index#a-lions">Using LionsOS</a><br><span class="summit-abstract-presenter">Ivan Velickovic</span>,
-      <span class="summit-abstract-affiliation">UNSW Sydney</span>
-    <td></td>
+      <span class="summit-abstract-affiliation">UNSW Sydney</span></td>
   </tr>
   <tr id="p-rust">
     <td>14:00 - 16:30</td>

_includes/abstracts/2024/cheri-morello.html

@@ -4,11 +4,7 @@
     SPDX-License-Identifier: CC-BY-SA-4.0
 -->
 <h4 class="summit-abstract-title">
-<<<<<<< HEAD
     Enhancing seL4’s C/C++ userspace memory safety using CHERI
-=======
-    seL4 CHERI/Morello port
->>>>>>> 88fc5d9 (resolve merge conflicts)
 </h4>
 <p class="summit-abstract-type">
     Talk