diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-15 06:30:24 -1000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-08-15 06:30:24 -1000 |
| commit | b045b8cc865316062e520693ad6c8bac85aabece (patch) | |
| tree | 12cf345f9ad5b1bc75778ba428e7ef9e4dee753d /drivers/net/vxlan.c | |
| parent | 3e763ec7914f20f55ebd9a5c087fa26e8452257e (diff) | |
| parent | 064855a69003c24bd6b473b367d364e418c57625 (diff) | |
Merge tag 'x86_urgent_for_v5.14_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Borislav Petkov:
"Two fixes:
- An objdump checker fix to ignore parenthesized strings in the
objdump version
- Fix resctrl default monitoring groups reporting when new subgroups
get created"
* tag 'x86_urgent_for_v5.14_rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/resctrl: Fix default monitoring groups reporting
x86/tools: Fix objdump version check again
Diffstat (limited to 'drivers/net/vxlan.c')
0 files changed, 0 insertions, 0 deletions