HardenedBSD/src 5aeb963 — contrib/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)
Delta | File | |
---|---|---|
+5,556 | -3,450 | contrib/sqlite3/sqlite3.c |
+8,287 | -0 | sys/contrib/openzfs/cmd/ztest.c |
+0 | -8,221 | sys/contrib/openzfs/cmd/ztest/ztest.c |
+4,219 | -3,950 | sys/contrib/device-tree/src/arm/tegra30-ouya.dts |
+6,576 | -1,135 | lib/libpmc/pmu-events/arch/x86/cascadelakex/cache.json |
+113 | -6,855 | lib/libpmc/pmu-events/arch/x86/cascadelakex/other.json |
+24,751 | -23,611 | 9,387 files not shown |
+738,363 | -247,462 | 9,393 files |