diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-14 07:44:48 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-05-14 07:44:48 -0700 |
commit | 011e33ee48849739aab1d25b9e41c824fb5383a9 (patch) | |
tree | c0b657de3946fa73af5b415d0e244bd37a2f71c8 /ipc/Makefile | |
parent | 491459b5ec3751a3a58129db4fb9f832e474bb95 (diff) | |
parent | 7d8accfaa0ab65e4282c8e58950f7d688342cd86 (diff) |
Merge tag 'x86_urgent_for_v6.4_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fix from Borislav Petkov:
- Add the required PCI IDs so that the generic SMN accesses provided by
amd_nb.c work for drivers which switch to them. Add a PCI device ID
to k10temp's table so that latter is loaded on such systems too
* tag 'x86_urgent_for_v6.4_rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
hwmon: (k10temp) Add PCI ID for family 19, model 78h
x86/amd_nb: Add PCI ID for family 19h model 78h
Diffstat (limited to 'ipc/Makefile')
0 files changed, 0 insertions, 0 deletions