Module Name: src
Committed By: christos
Date: Sat Jan 5 20:39:49 UTC 2019
Modified Files:
src/sys/external/bsd/acpica/dist/compiler: aslanalyze.c aslcompile.c
aslcompiler.h aslcompiler.l aslerror.c aslfileio.c aslfiles.c
aslload.c asllookup.c aslopcodes.c aslopt.c asloptions.c
aslpredef.c aslprepkg.c aslsupport.l asltree.c aslutils.c
aslwalks.c aslxref.c dtcompile.c dtfield.c dtparser.y dtsubtable.c
dttable.c dtutils.c prparser.y prutils.c
src/sys/external/bsd/acpica/dist/debugger: dbinput.c
src/sys/external/bsd/acpica/dist/dispatcher: dsopcode.c dspkginit.c
dsutils.c
src/sys/external/bsd/acpica/dist/events: evregion.c evrgnini.c
src/sys/external/bsd/acpica/dist/hardware: hwsleep.c
src/sys/external/bsd/acpica/dist/include: acdisasm.h acexcep.h
acglobal.h acinterp.h aclocal.h acnamesp.h acoutput.h acpixf.h
actypes.h
src/sys/external/bsd/acpica/dist/namespace: nsaccess.c nseval.c
src/sys/external/bsd/acpica/dist/tables: tbxfload.c
src/sys/external/bsd/acpica/dist/tools/acpixtract: acpixtract.c
src/sys/external/bsd/acpica/dist/utilities: utglobal.c utmisc.c utosi.c
Log Message:
- merge conflicts
- change default debug level to normal; the evaluation trace is too noisy
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/compiler/aslanalyze.c \
src/sys/external/bsd/acpica/dist/compiler/aslerror.c \
src/sys/external/bsd/acpica/dist/compiler/asllookup.c \
src/sys/external/bsd/acpica/dist/compiler/aslwalks.c \
src/sys/external/bsd/acpica/dist/compiler/prutils.c
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/compiler/aslcompile.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.h \
src/sys/external/bsd/acpica/dist/compiler/aslcompiler.l \
src/sys/external/bsd/acpica/dist/compiler/aslload.c \
src/sys/external/bsd/acpica/dist/compiler/asltree.c \
src/sys/external/bsd/acpica/dist/compiler/aslxref.c \
src/sys/external/bsd/acpica/dist/compiler/dtparser.y \
src/sys/external/bsd/acpica/dist/compiler/prparser.y
cvs rdiff -u -r1.8 -r1.9 \
src/sys/external/bsd/acpica/dist/compiler/aslfileio.c \
src/sys/external/bsd/acpica/dist/compiler/asloptions.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/compiler/aslfiles.c \
src/sys/external/bsd/acpica/dist/compiler/aslsupport.l \
src/sys/external/bsd/acpica/dist/compiler/dtcompile.c \
src/sys/external/bsd/acpica/dist/compiler/dtfield.c \
src/sys/external/bsd/acpica/dist/compiler/dttable.c \
src/sys/external/bsd/acpica/dist/compiler/dtutils.c
cvs rdiff -u -r1.9 -r1.10 \
src/sys/external/bsd/acpica/dist/compiler/aslopcodes.c \
src/sys/external/bsd/acpica/dist/compiler/aslpredef.c \
src/sys/external/bsd/acpica/dist/compiler/aslprepkg.c \
src/sys/external/bsd/acpica/dist/compiler/dtsubtable.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/compiler/aslopt.c
cvs rdiff -u -r1.21 -r1.22 \
src/sys/external/bsd/acpica/dist/compiler/aslutils.c
cvs rdiff -u -r1.16 -r1.17 \
src/sys/external/bsd/acpica/dist/debugger/dbinput.c
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/dispatcher/dsopcode.c \
src/sys/external/bsd/acpica/dist/dispatcher/dsutils.c
cvs rdiff -u -r1.2 -r1.3 \
src/sys/external/bsd/acpica/dist/dispatcher/dspkginit.c
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/acpica/dist/events/evregion.c
cvs rdiff -u -r1.12 -r1.13 src/sys/external/bsd/acpica/dist/events/evrgnini.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/hardware/hwsleep.c
cvs rdiff -u -r1.17 -r1.18 \
src/sys/external/bsd/acpica/dist/include/acdisasm.h \
src/sys/external/bsd/acpica/dist/include/acglobal.h \
src/sys/external/bsd/acpica/dist/include/aclocal.h
cvs rdiff -u -r1.10 -r1.11 src/sys/external/bsd/acpica/dist/include/acexcep.h
cvs rdiff -u -r1.11 -r1.12 \
src/sys/external/bsd/acpica/dist/include/acinterp.h
cvs rdiff -u -r1.14 -r1.15 \
src/sys/external/bsd/acpica/dist/include/acnamesp.h
cvs rdiff -u -r1.9 -r1.10 src/sys/external/bsd/acpica/dist/include/acoutput.h
cvs rdiff -u -r1.20 -r1.21 src/sys/external/bsd/acpica/dist/include/acpixf.h
cvs rdiff -u -r1.16 -r1.17 src/sys/external/bsd/acpica/dist/include/actypes.h
cvs rdiff -u -r1.15 -r1.16 \
src/sys/external/bsd/acpica/dist/namespace/nsaccess.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/namespace/nseval.c
cvs rdiff -u -r1.8 -r1.9 src/sys/external/bsd/acpica/dist/tables/tbxfload.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/tools/acpixtract/acpixtract.c
cvs rdiff -u -r1.10 -r1.11 \
src/sys/external/bsd/acpica/dist/utilities/utglobal.c \
src/sys/external/bsd/acpica/dist/utilities/utosi.c
cvs rdiff -u -r1.12 -r1.13 \
src/sys/external/bsd/acpica/dist/utilities/utmisc.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
