Closed ryanbsull closed 10 months ago
diff -Nupr src.orig/drivers/input/joydev.c src/drivers/input/joydev.c <<<<<<< HEAD --- src.orig/drivers/input/joydev.c 2023-07-14 10:41:05.666436404 -0400 +++ src/drivers/input/joydev.c 2023-07-14 10:41:18.589410987 -0400 ======= --- src.orig/drivers/input/joydev.c 2023-05-17 13:18:34.737721326 -0400 +++ src/drivers/input/joydev.c 2023-05-17 13:18:48.247702929 -0400 >>>>>>> 31ab7d3 (test/integration/rhel-9.3: add kernel-5.14.0-312.el9 tests) @@ -1096,3 +1096,47 @@ static void __exit joydev_exit(void)
[ ... snip ... ]
--- src.orig/drivers/input/misc/pcspkr.c 2023-05-17 13:18:34.741721320 -0400 +++ src/drivers/input/misc/pcspkr.c 2023-05-17 13:18:48.247702929 -0400
[ ... etc ... ]
[ ... snip ... ]
diff -Nupr src.orig/drivers/input/misc/pcspkr.c src/drivers/input/misc/pcspkr.c <<<<<<< HEAD --- src.orig/drivers/input/misc/pcspkr.c 2023-07-14 10:41:05.671436394 -0400 +++ src/drivers/input/misc/pcspkr.c 2023-07-14 10:41:18.590410985 -0400
--- src.orig/drivers/input/misc/pcspkr.c 2023-05-17 13:18:34.741721320 -0400 +++ src/drivers/input/misc/pcspkr.c 2023-05-17 13:18:48.247702929 -0400
[ ... etc ... ]