summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Clarify enif_open_resource_type if load failssverker/enif_open_resource_type-docSverker Eriksson2023-05-031-1/+3
* Merge branch 'sverker/24.3.4.11/erts/hashmap-collision-nodes/OTP-18569' into ...Sverker Eriksson2023-05-020-0/+0
|\
| * Merge branch 'sverker/24/erts/hashmap-collision-nodes/OTP-18569' into sverker...Sverker Eriksson2023-04-279-365/+693
| |\
* | \ Merge branch 'sverker/crypto/libre-ssl-fixing/OTP-18571' into maintSverker Eriksson2023-05-021-0/+9
|\ \ \
| * | | crypto: Fix cmac_update aes_128_cbc for LibreSSLSverker Eriksson2023-04-251-0/+9
* | | | Merge branch 'sverker/25/erts/hashmap-collision-nodes/OTP-18569' into maintSverker Eriksson2023-05-021-12/+7
|\ \ \ \
| * \ \ \ Merge branch 'sverker/24/erts/hashmap-collision-nodes/OTP-18569'Sverker Eriksson2023-04-271-12/+7
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | erts: Remove dead codeSverker Eriksson2023-04-271-12/+7
* | | | | Merge branch 'bjorn/compiler/beam_validator/25/GH-7147/OTP-18565' into maintBjörn Gustavsson2023-05-024-9/+110
|\ \ \ \ \
| * | | | | Fix two type-related bugsBjörn Gustavsson2023-05-024-9/+110
| | |_|/ / | |/| | |
* | | | | Merge branch 'rickard/creation-fix/25.3.1/OTP-18570' into maintRickard Green2023-04-304-5/+155
|\ \ \ \ \
| * \ \ \ \ Merge branch 'rickard/creation-fix/24.3.4/OTP-18570' into rickard/creation-fi...Rickard Green2023-04-294-5/+155
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'rickard/creation-fix/23.3.4/OTP-18570' into rickard/creation-fi...Rickard Green2023-04-294-2/+154
| | |\ \ \ \ \
| | | * | | | | [erts] ensure no mix of external and internal identifiersRickard Green2023-04-294-2/+154
* | | | | | | | Merge branch 'maint-25' into maintJakub Witczak2023-04-2760-52/+310
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Updated OTP versionOTP-25.3.1Erlang/OTP2023-04-252-1/+2
| * | | | | | | Prepare releaseErlang/OTP2023-04-2523-59/+272
| * | | | | | | Update copyright yearErlang/OTP2023-04-2540-40/+40
| * | | | | | | Merge branch 'bjorn/erts/utf32/25/OTP-18560' into maint-25Erlang/OTP2023-04-254-0/+18
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'dgud/wx/fix-debug/OTP-18512' into maint-25Erlang/OTP2023-04-2531-2625/+2911
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'rickard/no-native-atomics-fix/GH-7114/OTP-18563' into maint-25Erlang/OTP2023-04-251-0/+1
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'rickard/mon-link-dbg-fix' into maint-25Erlang/OTP2023-04-251-6/+16
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'kuba/maint-24/inets/fix_httpc_remote_socket_close/OTP-18545' in...Erlang/OTP2023-04-251-8/+18
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kuba/crypto/fix_len_var_type/OTP-18555' into maint-25Erlang/OTP2023-04-251-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/aliasmonitor-fix/25.3/OTP-18557' into maint-25Erlang/OTP2023-04-254-6/+57
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'john/erts/fix-ic-dc-config-test/OTP-18554' into maint-25Erlang/OTP2023-04-255-14/+53
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'kuba/ssl/kuba/ssl/keylog_fix/OTP-18489' into maint-25Erlang/OTP2023-04-253-56/+94
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'john/erts/fix-overlapping-code-barriers-25/OTP-18553' into main...Erlang/OTP2023-04-251-6/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ingela/ssl/test-stop-using-weak-key' into maint-25Erlang/OTP2023-04-251-7/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ingela/ssl/correct-sigalg-order/OTP-18550' into maint-25Erlang/OTP2023-04-252-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'rickard/driver-call-callback-fix/24.3.4/OTP-18525' into maint-25Erlang/OTP2023-04-251-16/+28
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'john/erts/fix-hd-tl-loader-transformations/GH-7024/OTP-18519' i...Erlang/OTP2023-04-254-30/+44
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ingela/eldap/ssl-connection-information/OTP-18480' into maint-25Erlang/OTP2023-04-253-5/+69
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'john/compiler/fix-inert-update-type/GH-6969/OTP-18516' into mai...Erlang/OTP2023-04-252-2/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bjorn/stdlib/erl_parse/GH-6956/OTP-18506' into maint-25Erlang/OTP2023-04-251-2/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'ingela/inets/httpc/maint-25/queue-bug/OTP-18509' into maint-25Erlang/OTP2023-04-251-9/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bjorn/compiler/fix-lost-map-exception/GH-6960/OTP-18497' into m...Erlang/OTP2023-04-252-17/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'bmk/snmp/agent/20230127/minimize_error_reporting_during_failed_...Erlang/OTP2023-04-258-67/+202
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sverker/25/erts/hashmap-collision-nodes' into maintSverker Eriksson2023-04-2612-450/+793
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'sverker/24/erts/hashmap-collision-nodes' into sverker/25/erts/h...Sverker Eriksson2023-04-2612-450/+793
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | erts: Implement hashmap collision nodesSverker Eriksson2023-04-268-348/+680
| | * | | | | | | | | | | | | | | | | | | | | | | | erts: Fix/optimize macro arityvalSverker Eriksson2023-04-261-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | erts: Simplify map hashingJohn Högberg2023-04-264-38/+39
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ingela/eldap/ssl-connection-information/OTP-18480' into maintIngela Anderton Andin2023-04-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | eldap:Fix since tagIngela Anderton Andin2023-04-251-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | Update lib/eldap/src/eldap.erlanupamasingh102023-04-251-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | Update lib/eldap/src/eldap.erlanupamasingh102023-04-251-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | Update lib/eldap/src/eldap.erlanupamasingh102023-04-251-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | Update lib/eldap/src/eldap.erlanupamasingh102023-04-251-5/+6
| * | | | | | | | | | | | | | | | | | | | | | | | Update eldap:info/1 documentationanupamasingh102023-04-251-4/+5