HardenedBSD/src 5aeb963contrib/sqlite3 sqlite3.c, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json other.json

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+5,556-3,450contrib/sqlite3/sqlite3.c
+8,287-0sys/contrib/openzfs/cmd/ztest.c
+0-8,221sys/contrib/openzfs/cmd/ztest/ztest.c
+4,219-3,950sys/contrib/device-tree/src/arm/tegra30-ouya.dts
+6,576-1,135lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+113-6,855lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+24,751-23,6119,387 files not shown
+738,363-247,4629,393 files

HardenedBSD/src a0a7199lib/libpmc/pmu-events/arch/x86/broadwell cache.json memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json other.json

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master
DeltaFile
+6,576-1,135lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+113-6,855lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+3,153-3,142lib/libpmc/pmu-events/arch/x86/broadwell/cache.json
+2,959-2,951lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+2,590-2,711lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+5,150-0lib/libpmc/pmu-events/arch/x86/sapphirerapids/uncore-other.json
+20,541-16,794246 files not shown
+101,040-78,147252 files

HardenedBSD/src e58ca5clib/libpmc/pmu-events/arch/x86/broadwell cache.json memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json other.json

libpmc: Another update of x86 event definitions.

MFC after:      1 month

(cherry picked from commit 18054d0220cfc8df9c9568c437bd6fbb59d53c3c)
DeltaFile
+6,576-1,135lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+113-6,855lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+3,153-3,142lib/libpmc/pmu-events/arch/x86/broadwell/cache.json
+2,959-2,951lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+2,590-2,711lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+5,150-0lib/libpmc/pmu-events/arch/x86/sapphirerapids/uncore-other.json
+20,541-16,794216 files not shown
+99,940-77,375222 files

HardenedBSD/src 628e447lib/libpmc/pmu-events/arch/x86/broadwell cache.json memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json other.json

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+6,576-1,135lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+113-6,855lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+3,153-3,142lib/libpmc/pmu-events/arch/x86/broadwell/cache.json
+2,959-2,951lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+2,590-2,711lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+5,150-0lib/libpmc/pmu-events/arch/x86/sapphirerapids/uncore-other.json
+20,541-16,794216 files not shown
+99,940-77,375222 files

HardenedBSD/src 18054d0lib/libpmc/pmu-events/arch/x86/broadwell cache.json memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json other.json

libpmc: Another update of x86 event definitions.

MFC after:      1 month
DeltaFile
+6,576-1,135lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+113-6,855lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+3,153-3,142lib/libpmc/pmu-events/arch/x86/broadwell/cache.json
+2,959-2,951lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+2,590-2,711lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+5,150-0lib/libpmc/pmu-events/arch/x86/sapphirerapids/uncore-other.json
+20,541-16,794216 files not shown
+99,940-77,375222 files

HardenedBSD/src 6a32f4fcontrib/llvm-project/llvm/lib/Analysis/models/inliner saved_model.pbtxt, contrib/sqlite3 sqlite3.c

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
        usr.sbin/hbsd-update/hbsd-update.conf (unresolved)
DeltaFile
+0-32,634contrib/llvm-project/llvm/lib/Analysis/models/inliner/saved_model.pbtxt
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+10,895-7,688contrib/sqlite3/sqlite3.c
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+0-13,083sys/contrib/octeon-sdk/cvmx-ciu-defs.h
+36,150-78,65213,448 files not shown
+1,006,794-1,015,87713,454 files

HardenedBSD/src eeec66blib/libpmc/pmu-events/arch/x86/amdzen1 l3cache.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

Merge remote-tracking branch 'freebsd/stable/12' into hardened/12-stable/master
DeltaFile
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,817-2,819lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+0-5,411lib/libpmc/pmu-events/arch/x86/amdzen1/l3cache.json
+1,626-1,614lib/libpmc/pmu-events/arch/x86/skylakex/cache.json
+29,698-35,091105 files not shown
+55,862-48,503111 files

HardenedBSD/src bf2df41lib/libpmc/pmu-events/arch/x86/amdzen1 l3cache.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

libpmc: Update some x86 event definitions.

MFC after:      1 month

(cherry picked from commit 52d973f52c07b94909a6487be373c269988dc151)
DeltaFile
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,817-2,819lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+0-5,411lib/libpmc/pmu-events/arch/x86/amdzen1/l3cache.json
+1,626-1,614lib/libpmc/pmu-events/arch/x86/skylakex/cache.json
+29,698-35,09184 files not shown
+54,096-48,39190 files

HardenedBSD/src 100abcalib/libpmc/pmu-events/arch/x86/amdzen1 l3cache.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

Merge remote-tracking branch 'freebsd/stable/13' into hardened/13-stable/master
DeltaFile
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,817-2,819lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+0-5,411lib/libpmc/pmu-events/arch/x86/amdzen1/l3cache.json
+1,626-1,614lib/libpmc/pmu-events/arch/x86/skylakex/cache.json
+29,698-35,09184 files not shown
+54,096-48,39190 files

HardenedBSD/src 9e5bf8clib/libpmc/pmu-events/arch/x86/amdzen1 l3cache.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

libpmc: Update some x86 event definitions.

MFC after:      1 month

(cherry picked from commit 52d973f52c07b94909a6487be373c269988dc151)
DeltaFile
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,817-2,819lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+0-5,411lib/libpmc/pmu-events/arch/x86/amdzen1/l3cache.json
+1,626-1,614lib/libpmc/pmu-events/arch/x86/skylakex/cache.json
+29,698-35,09184 files not shown
+54,096-48,39190 files

HardenedBSD/src aabfd25lib/libpmc/pmu-events/arch/x86/amdzen1 l3cache.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

Merge branch 'hardened/current/master' into hardened/current/sensitive
DeltaFile
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,817-2,819lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+0-5,411lib/libpmc/pmu-events/arch/x86/amdzen1/l3cache.json
+0-3,260sys/dev/esp/ncr53c9x.c
+28,072-36,737163 files not shown
+54,164-77,124169 files

HardenedBSD/src 75d75f3lib/libpmc/pmu-events/arch/x86/amdzen1 l3cache.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

Merge branch 'freebsd/current/main' into hardened/current/master
DeltaFile
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,817-2,819lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+0-5,411lib/libpmc/pmu-events/arch/x86/amdzen1/l3cache.json
+1,626-1,614lib/libpmc/pmu-events/arch/x86/skylakex/cache.json
+29,698-35,09193 files not shown
+54,146-48,41699 files

HardenedBSD/src 52d973flib/libpmc/pmu-events/arch/x86/amdzen1 l3cache.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

libpmc: Update some x86 event definitions.

MFC after:      1 month
DeltaFile
+9,480-9,480lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+8,062-8,054lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+7,713-7,713lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,817-2,819lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+0-5,411lib/libpmc/pmu-events/arch/x86/amdzen1/l3cache.json
+1,626-1,614lib/libpmc/pmu-events/arch/x86/skylakex/cache.json
+29,698-35,09184 files not shown
+54,096-48,39190 files

HardenedBSD/src c7ce6b0contrib/libstdc++ configure, lib/clang/liblldb LLDBWrapLua.cpp

Merge branch 'hardened/current/master' into hardened/current/uninit-autoinit
DeltaFile
+0-111,817contrib/libstdc++/configure
+72,183-0lib/clang/liblldb/LLDBWrapLua.cpp
+71,590-432tools/tools/locale/etc/final-maps/widths.txt
+31,726-39,305share/ctypedef/ja_JP.eucJP.src
+59,521-0sys/contrib/dev/iwm/iwm-9000-34.fw.uu
+59,517-0sys/contrib/dev/iwm/iwm-9260-34.fw.uu
+294,537-151,55460,534 files not shown
+10,288,584-10,879,88160,540 files

HardenedBSD/src 515d435lib/libpmc/pmu-events/arch/x86/broadwell memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

Merge branch 'freebsd/12-stable/master' into hardened/12-stable/master

* freebsd/12-stable/master:
  MFC:  r360175
  MFC r351514: Don't consider PCIe hot-plug command timeout fatal.
  MFC r359622 (by mmacy): Update x86 counters
DeltaFile
+9,976-0lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+9,909-0lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+8,662-0lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,073-84lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+1,770-0lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json
+820-820lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+33,210-904664 files not shown
+49,779-8,348670 files

HardenedBSD/src 0892e83lib/libpmc/pmu-events/arch/x86/broadwell memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

MFC r359622 (by mmacy): Update x86 counters
DeltaFile
+9,976-0lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+9,909-0lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+8,662-0lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,073-84lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+1,770-0lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json
+820-820lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+33,210-90489 files not shown
+47,290-7,19395 files

HardenedBSD/src d892448 (r360270)lib/libpmc/pmu-events/arch/x86/broadwell memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

MFC r359622 (by mmacy): Update x86 counters
DeltaFile
+9,976-0lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+9,909-0lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+8,662-0lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,073-84lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+1,770-0lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json
+820-820lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+33,210-90489 files not shown
+47,290-7,19395 files

HardenedBSD/src 369b257contrib/bsnmp/tests catch.hpp, lib/clang/liblldb LLDBWrapLua.cpp

Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/cross-dso-cfi

Conflicts:
        share/man/man5/src.conf.5 (unresolved)
DeltaFile
+71,334-0lib/clang/liblldb/LLDBWrapLua.cpp
+17,597-0contrib/bsnmp/tests/catch.hpp
+9,976-0lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+9,909-0lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+8,662-0lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+0-4,672secure/lib/libcrypto/amd64/sha256-mb-x86_64.S
+117,478-4,6724,240 files not shown
+355,626-132,0804,246 files

HardenedBSD/src db41dbalib/libpmc/pmu-events/arch/x86/broadwell memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

Merge branch 'freebsd/current/master' into hardened/current/master

* freebsd/current/master:
  Clean up global variable declarations in the dump and restore utilities so that they will compile with -fno-common.
  vt: avoid overrun when stride is not a multiple of bytes per pixel
  Update x86 counters
DeltaFile
+9,976-0lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+9,909-0lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+8,662-0lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,073-84lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+1,770-0lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json
+820-820lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+33,210-90499 files not shown
+47,389-7,266105 files

HardenedBSD/src b460ff0lib/libpmc/pmu-events/arch/x86/broadwell memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

Update x86 counters

MFC after:      1 week
DeltaFile
+9,976-0lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+9,909-0lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+8,662-0lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,073-84lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+1,770-0lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json
+820-820lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+33,210-90489 files not shown
+47,290-7,19395 files

HardenedBSD/src 92b1485 (r359622)lib/libpmc/pmu-events/arch/x86/broadwell memory.json, lib/libpmc/pmu-events/arch/x86/cascadelakex cache.json memory.json

Update x86 counters

MFC after:      1 week
DeltaFile
+9,976-0lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json
+9,909-0lib/libpmc/pmu-events/arch/x86/cascadelakex/memory.json
+8,662-0lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json
+2,073-84lib/libpmc/pmu-events/arch/x86/skylake/cache.json
+1,770-0lib/libpmc/pmu-events/arch/x86/cascadelakex/uncore-other.json
+820-820lib/libpmc/pmu-events/arch/x86/broadwell/memory.json
+33,210-90489 files not shown
+47,290-7,19395 files