Merge branch 'lukas/misc-fixes' into maint

* lukas/misc-fixes:
  erts: Fix erl -emu_flavor docs and expand BeamJit perf
  github actions: Only run sync on erlang repo
  otp: Add test folders to gitignore

4 files changed, 14 insertions, 3 deletions

diff --git a/.github/workflows/sync-github-releases.yaml b/.github/workflows/sync-github-releases.yaml
index 7aafeae283..d3d3cf901c 100644
--- a/.github/workflows/sync-github-releases.yaml
+++ b/.github/workflows/sync-github-releases.yaml
@@ -12,6 +12,7 @@ jobs:
 
   # Wait for up to a minute for previous runs to complete, abort if not done by then
   pre-ci:
+    if: github.repository == 'erlang/otp'
     runs-on: ubuntu-latest
     timeout-minutes: 1
     steps:
diff --git a/.gitignore b/.gitignore
index e90bf591f3..794d384b4d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -221,11 +221,13 @@ JAVADOC-GENERATED
 
 /lib/*/test/*_SUITE_make.erl
 /lib/*/test/*_SUITE_data/Makefile
+/lib/*/make_test_dir/
 /erts/emulator/test/*_SUITE_make.erl
 /erts/emulator/test/*_native_SUITE.erl
 /erts/emulator/test/*_SUITE_data/Makefile
 /erts/test/install_SUITE_data/install_bin
 /erts/test/autoimport_SUITE_data/erlang.xml
+/erts/emulator/make_test_dir/
 
 # common_test
 
diff --git a/erts/doc/src/erl_cmd.xml b/erts/doc/src/erl_cmd.xml
index 5220663f92..7ef3ca88f9 100644
--- a/erts/doc/src/erl_cmd.xml
+++ b/erts/doc/src/erl_cmd.xml
@@ -304,10 +304,13 @@ $ <input>erl \
       <item>
         <p>Useful for debugging. Prints the arguments sent to the emulator.</p>
       </item>
-      <tag><c><![CDATA[-emu_flavor Flavor]]></c></tag>
+      <tag><c><![CDATA[-emu_flavor emu|jit|smp]]></c></tag>
       <item>
-        <p>Start an emulator of a different flavor. The current available flavors
-          are: <c>emu</c> and <c>jit</c>. You can combine this flag with
+        <p>Start an emulator of a different flavor. Normally only one flavor is
+          available, more can be added by building specific flavors. The currently
+          available flavors are: <c>emu</c> and <c>jit</c>.
+          The <c>smp</c> flavor is an alias for the current default flavor.
+          You can combine this flag with
           <c>--emu_type</c>. You can get the current flavor at run-time using
           <seeerl marker="erlang#system_info_emu_flavor">
             <c>erlang:system_info(emu_flavor)</c></seeerl>.
diff --git a/erts/emulator/internal_doc/BeamAsm.md b/erts/emulator/internal_doc/BeamAsm.md
index 4988126e62..3b4ac619ce 100644
--- a/erts/emulator/internal_doc/BeamAsm.md
+++ b/erts/emulator/internal_doc/BeamAsm.md
@@ -407,6 +407,11 @@ we have found useful:
     Create an archive with all the artifacts needed to inspect the data
     on another host. In early version of perf this command does not work,
     instead you can use [this bash script](https://github.com/torvalds/linux/blob/master/tools/perf/perf-archive.sh).
+* `perf report` gives "failed to process sample" and/or "failed to process type: 68"
+    This probably means that you are running a bugge version of perf. We have
+    seen this when running Ubuntu 18.04 with kernel version 4. If you update
+    to Ubuntu 20.04 or use Ubuntu 18.04 with kernel version 5 the problem
+    should go away.
 
 ## FAQ