git/linux-cryptodev-2.6
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git synced 2026-04-18 03:23:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'next' into for-linus

Browse Source 
Prepare input updates for 6.17 merge window.
This commit is contained in:
Dmitry Torokhov
2025-08-06 10:08:54 -07:00
parent bcce05041b 4f67c41894
commit ab93e0dd72
13096 changed files with 591712 additions and 258860 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/input/mouse/alps.c
View File

@@ -1582,7 +1582,7 @@ static psmouse_ret_t alps_handle_interleaved_ps2(struct psmouse *psmouse)
static void alps_flush_packet(struct timer_list *t)
{
struct alps_data *priv = from_timer(priv, t, timer);
struct alps_data *priv = timer_container_of(priv, t, timer);
struct psmouse *psmouse = priv->psmouse;
guard(serio_pause_rx)(psmouse->ps2dev.serio);