You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge branch 'for-next' into for-linus
Conflicts: kernel/irq/chip.c
This commit is contained in:
+1
-1
@@ -2655,7 +2655,7 @@ COMPATIBLE_IOCTL(TIOCSLTC)
|
||||
#endif
|
||||
#ifdef TIOCSTART
|
||||
/*
|
||||
* For these two we have defintions in ioctls.h and/or termios.h on
|
||||
* For these two we have definitions in ioctls.h and/or termios.h on
|
||||
* some architectures but no actual implemention. Some applications
|
||||
* like bash call them if they are defined in the headers, so we provide
|
||||
* entries here to avoid syslog message spew.
|
||||
|
||||
Reference in New Issue
Block a user