diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-01 00:37:49 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-07-01 00:37:49 +0200 |
| commit | a6eaf3850cb171c328a8b0db6d3c79286a1eba9d (patch) | |
| tree | 2cef5ef9d0c7ae61caba1c9d25c80b6c6d6c1254 /drivers/nfc/pn533/uart.c | |
| parent | Merge tag 'microblaze-v5.14' of git://git.monstr.eu/linux-2.6-microblaze (diff) | |
| parent | Merge branch 'sched/core' into sched/urgent, to pick up fix (diff) | |
| download | linux-a6eaf3850cb171c328a8b0db6d3c79286a1eba9d.tar.xz linux-a6eaf3850cb171c328a8b0db6d3c79286a1eba9d.zip | |
Merge tag 'sched-urgent-2021-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
- Fix a small inconsistency (bug) in load tracking, caught by a new
warning that several people reported.
- Flip CONFIG_SCHED_CORE to default-disabled, and update the Kconfig
help text.
* tag 'sched-urgent-2021-06-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/core: Disable CONFIG_SCHED_CORE by default
sched/fair: Ensure _sum and _avg values stay consistent
Diffstat (limited to 'drivers/nfc/pn533/uart.c')
0 files changed, 0 insertions, 0 deletions