diff options
author | 2020-09-22 13:15:19 +0300 | |
---|---|---|
committer | 2020-09-22 13:15:42 +0300 | |
commit | b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248 (patch) | |
tree | 22a68caea35b25309595167acc387c491d934d24 /tools/perf/scripts/python/export-to-postgresql.py | |
parent | Linux 5.9-rc6 (diff) | |
parent | Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu (diff) | |
download | wireguard-linux-b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248.tar.xz wireguard-linux-b63c2eb1bfaaee9e328c7a53cb5d9b077cc59248.zip |
Merge remote-tracking branch 'origin/master' into drm-intel-fixes
Direct backmerge to get commit 88b67edd7247 ("dax: Fix compilation for
CONFIG_DAX && !CONFIG_FS_DAX") to fix CI build issues.
Acked-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions