diff options
author | Ingo Molnar <mingo@kernel.org> | 2024-02-19 21:13:31 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2024-02-19 22:27:57 +0100 |
commit | 94bf12af352d3df25fb68d13a3eb369f5cbaaee7 (patch) | |
tree | ba70da29dde824b2ef7a37e23b1047b2a956642f /drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | |
parent | 14274d0bd31b4debf28284604589f596ad2e99f2 (diff) | |
parent | b401b621758e46812da61fa58a67c3fd8d91de0d (diff) | |
download | linux-94bf12af352d3df25fb68d13a3eb369f5cbaaee7.tar.gz linux-94bf12af352d3df25fb68d13a3eb369f5cbaaee7.tar.bz2 linux-94bf12af352d3df25fb68d13a3eb369f5cbaaee7.zip |
Merge tag 'v6.8-rc5' into timers/core, to resolve conflict
There's a conflict between this recent upstream fix:
dad6a09f3148 ("hrtimer: Report offline hrtimer enqueue")
and a pending commit in the timers tree:
1a4729ecafc2 ("hrtimers: Move hrtimer base related definitions into hrtimer_defs.h")
Resolve it by applying the upstream fix to the new <linux/hrtimer_defs.h> header.
Conflict:
include/linux/hrtimer.h
Semantic conflict:
include/linux/hrtimer_defs.h
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/wireless/mediatek/mt76/mt7615/mmio.c')
-rw-r--r-- | drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c index ac036a072439..87a956ea3ad7 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mmio.c @@ -270,4 +270,5 @@ static void __exit mt7615_exit(void) module_init(mt7615_init); module_exit(mt7615_exit); +MODULE_DESCRIPTION("MediaTek MT7615E MMIO helpers"); MODULE_LICENSE("Dual BSD/GPL"); |