diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 16:50:09 +0300 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2020-01-02 16:50:58 +0300 |
| commit | 7d6aa9ba4f8228c75970fc4fad27194611a548a6 (patch) | |
| tree | 4bbd64f6671391d6d93c1a1806ffec005114524e /tools/testing/selftests/rseq/settings | |
| parent | 1ee7826ab68f7e9fa1a01533983acf6a6f62e297 (diff) | |
| parent | fe23d63422c83cd7c8154dc7faef6af97be4b948 (diff) | |
| download | linux-7d6aa9ba4f8228c75970fc4fad27194611a548a6.tar.xz | |
Merge remote-tracking branch 'net-next/master' into mac80211-next
Merging to get the mac80211 updates that have since propagated
into net-next.
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'tools/testing/selftests/rseq/settings')
| -rw-r--r-- | tools/testing/selftests/rseq/settings | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tools/testing/selftests/rseq/settings b/tools/testing/selftests/rseq/settings new file mode 100644 index 000000000000..e7b9417537fb --- /dev/null +++ b/tools/testing/selftests/rseq/settings @@ -0,0 +1 @@ +timeout=0 |