diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-01 09:44:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-03-01 09:44:22 -0800 |
| commit | 1d2aea1bcf68992c90218f47405bee29efd722cd (patch) | |
| tree | b4497ef833a7da3c85b3e4445426409959e724cd /security/apparmor | |
| parent | a8356cdb5bd5abc74f814d76bd37900997fad35d (diff) | |
| parent | ff30bd6a6618e979b16977617371c0f28a95036e (diff) | |
Merge tag 'sh-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux
Pull sh updates from John Paul Adrian Glaubitz:
- regression fix in connection with the rtl8169 driver on SuperH boards
that was introduced when the driver was switched to use
devm_clk_get_optional_enabled() to simplify the code (Geert
Uytterhoeven)
- build warning fix to allow the kernel to be built with CONFIG_WERROR
enabled (Michael Karcher)
* tag 'sh-for-v6.3-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux:
sh: clk: Fix clk_enable() to return 0 on NULL clk
sh: intc: Avoid spurious sizeof-pointer-div warning
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions