Darren Reed beec821495 Resolve conflicts created by import.

1997-04-03 10:47:12 +00:00

..

alpha

Removed potentially harmful garbage <vm/lock.h> and fixed bogus

1997-04-01 08:39:07 +00:00

amd64

Removed a wrong comment of mine.

1997-04-01 16:22:31 +00:00

compat/linux

Removed potentially harmful garbage <vm/lock.h> and fixed bogus

1997-04-01 08:39:07 +00:00

compile

…

conf

Synchronize with sys/i386/confi/files.i386 revision 1.158.

1997-04-03 09:55:26 +00:00

ddb

Fixed gratuitous ANSIisms.

1997-04-01 14:31:06 +00:00

dev

CFLAGS += -I. so that building in an obj directory works.

1997-04-03 05:56:00 +00:00

fs

Don't include <sys/ioctl.h> in the kernel. Stage 3: include

1997-03-24 11:37:53 +00:00

geom

Don't include <sys/ioctl.h> in the kernel. Stage 1: don't include

1997-03-24 11:25:10 +00:00

gnu

Fixed gratuitous ANSIisms.

1997-04-01 15:22:59 +00:00

i386

If flag 0x4000 (Sleephack) is defined, assume that the disk is sleeping

1997-04-03 09:43:50 +00:00

isa

Interim patch/kludge for keyboard lock-up when `kbdcontrol' tries to

1997-03-28 10:11:24 +00:00

isofs/cd9660

Don't include <sys/ioctl.h> in the kernel. Stage 1: don't include

1997-03-24 11:25:10 +00:00

kern

Don't incorrectly set P_SUGID in setre[ug]id() for no reason, as noticed

1997-04-02 17:05:49 +00:00

libkern

Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not

1997-02-22 09:48:43 +00:00

miscfs

Don't include <sys/ioctl.h> in the kernel. Stage 3: include

1997-03-24 11:37:53 +00:00

modules

Revert $FreeBSD$ back to $Id$

1997-02-22 12:49:29 +00:00

msdosfs

Don't #include <sys/fcntl.h> in <sys/file.h> if KERNEL is defined.

1997-03-23 03:37:54 +00:00

net

Don't include <sys/ioctl.h> in the kernel. Stage 6: include

1997-03-24 12:12:36 +00:00

netatalk

Don't include <sys/ioctl.h> in the kernel. Stage 2: include

1997-03-24 11:33:46 +00:00

netinet

Resolve conflicts created by import.

1997-04-03 10:47:12 +00:00

netipx

Don't include <sys/ioctl.h> in the kernel. Stage 2: include

1997-03-24 11:33:46 +00:00

netkey

This is the `netkey' kernel key-management service (the PF_KEY analogue

1996-06-14 17:22:18 +00:00

netns

Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not

1997-02-22 09:48:43 +00:00

nfs

The code which recovered from a modified directory situation did not check

1997-04-03 07:52:00 +00:00

nfsclient

The code which recovered from a modified directory situation did not check

1997-04-03 07:52:00 +00:00

nfsserver

Removed #include of <ufs/ufs/dir.h>. Nfs no longer depends on any ufs

1997-03-29 12:40:20 +00:00

pc98

Removed <mv/lock.h> and <mv/vm_map.h>.

1997-04-03 09:59:03 +00:00

pccard

Argh, this time get the parentheses right. This hasn't been a good day for me.

1997-02-21 05:46:57 +00:00

pci

PAL support: magic numbers moved into format_params structure.

1997-04-02 01:48:39 +00:00

powerpc/include

Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not

1997-02-22 09:48:43 +00:00

rpc

Revert $FreeBSD$ to $Id$

1997-02-23 09:21:14 +00:00

scsi

Moved prototypes of scsi_data, scsi_link and proc before scsi_adapter.

1997-04-03 10:09:29 +00:00

sys

PAL support: magic numbers moved into format_params structure.

1997-04-02 01:48:39 +00:00

tools

Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not

1997-02-22 09:48:43 +00:00

ufs

Removed nested include of <ufs/ufs/dir.h>. Use the pre-Lite2 hack of

1997-04-01 08:02:00 +00:00

vm

Removed potentially harmful garbage <vm/lock.h> and fixed bogus

1997-04-01 08:39:07 +00:00

Makefile

Back out part 1 of the MCFH that changed $Id$ to $FreeBSD$. We are not

1997-02-22 09:48:43 +00:00