ff5de51147
conflicts. XXX: Fix the conflicts. 1. chio: change to 'x' from 'c' so that it does not conflict with cdio. keep the 'c' ioctls in the driver for compat. 2. ppp/slip: change SLCGUNIT to some other number and accept the old number in the driver. 3. ipf: [3 instances] Have darren fix them. |
||
---|---|---|
.. | ||
kdump.1 | ||
kdump.c | ||
Makefile | ||
Makefile.ioctl-c | ||
Makefile.siginfo-c | ||
mkioctls | ||
mksiginfos | ||
setemul.c | ||
setemul.h |