[Midnightbsd-cvs] [MidnightBSD/src] 475c0c: Update the OS version in current to 2.1

[Lucas Holt]

  Branch: refs/heads/master
  Home:   https://github.com/MidnightBSD/src
  Commit: 475c0c50253cdec9dbfdb8a4dd9fa3e3466f8b19
      https://github.com/MidnightBSD/src/commit/475c0c50253cdec9dbfdb8a4dd9fa3e3466f8b19
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2020-11-22 (Sun, 22 Nov 2020)

  Changed paths:
    M sys/conf/newvers.sh
    M sys/sys/param.h

  Log Message:
  -----------
  Update the OS version in current to 2.1


  Commit: d1db107c23c53dff2f1cf6ea38aeb55ceaac5008
      https://github.com/MidnightBSD/src/commit/d1db107c23c53dff2f1cf6ea38aeb55ceaac5008
  Author: Lucas Holt <luke at foolishgames.com>
  Date:   2020-11-22 (Sun, 22 Nov 2020)

  Changed paths:
    M UPDATING
    M contrib/file/ChangeLog
    M contrib/file/Makefile.in
    M contrib/file/README
    M contrib/file/aclocal.m4
    M contrib/file/compile
    M contrib/file/config.guess
    M contrib/file/config.h.in
    M contrib/file/config.sub
    M contrib/file/configure
    M contrib/file/configure.ac
    M contrib/file/depcomp
    M contrib/file/doc/Makefile.in
    M contrib/file/doc/file.man
    M contrib/file/doc/libmagic.man
    M contrib/file/doc/magic.man
    M contrib/file/ltmain.sh
    M contrib/file/m4/libtool.m4
    M contrib/file/m4/ltoptions.m4
    M contrib/file/m4/ltsugar.m4
    M contrib/file/m4/ltversion.m4
    M contrib/file/m4/lt~obsolete.m4
    M contrib/file/magic/Magdir/android
    M contrib/file/magic/Magdir/animation
    M contrib/file/magic/Magdir/apple
    M contrib/file/magic/Magdir/archive
    M contrib/file/magic/Magdir/audio
    M contrib/file/magic/Magdir/bsi
    M contrib/file/magic/Magdir/c-lang
    M contrib/file/magic/Magdir/cad
    M contrib/file/magic/Magdir/commands
    M contrib/file/magic/Magdir/compress
    M contrib/file/magic/Magdir/console
    M contrib/file/magic/Magdir/database
    M contrib/file/magic/Magdir/elf
    M contrib/file/magic/Magdir/espressif
    M contrib/file/magic/Magdir/filesystems
    M contrib/file/magic/Magdir/fonts
    A contrib/file/magic/Magdir/forth
    M contrib/file/magic/Magdir/frame
    M contrib/file/magic/Magdir/games
    M contrib/file/magic/Magdir/gimp
    A contrib/file/magic/Magdir/git
    M contrib/file/magic/Magdir/icc
    M contrib/file/magic/Magdir/images
    M contrib/file/magic/Magdir/javascript
    M contrib/file/magic/Magdir/kml
    M contrib/file/magic/Magdir/linux
    M contrib/file/magic/Magdir/macintosh
    M contrib/file/magic/Magdir/mail.news
    M contrib/file/magic/Magdir/map
    A contrib/file/magic/Magdir/modulefile
    M contrib/file/magic/Magdir/msdos
    M contrib/file/magic/Magdir/msooxml
    M contrib/file/magic/Magdir/ole2compounddocs
    A contrib/file/magic/Magdir/openfst
    A contrib/file/magic/Magdir/opentimestamps
    M contrib/file/magic/Magdir/pdf
    A contrib/file/magic/Magdir/pmem
    M contrib/file/magic/Magdir/python
    M contrib/file/magic/Magdir/rpi
    A contrib/file/magic/Magdir/rst
    M contrib/file/magic/Magdir/ruby
    M contrib/file/magic/Magdir/sgml
    M contrib/file/magic/Magdir/sniffer
    A contrib/file/magic/Magdir/sosi
    M contrib/file/magic/Magdir/ssh
    M contrib/file/magic/Magdir/uuencode
    M contrib/file/magic/Magdir/varied.script
    M contrib/file/magic/Magdir/vax
    M contrib/file/magic/Magdir/windows
    M contrib/file/magic/Magdir/wordprocessors
    M contrib/file/magic/Magdir/zip
    M contrib/file/magic/Makefile.am
    M contrib/file/magic/Makefile.in
    M contrib/file/missing
    M contrib/file/python/Makefile.in
    M contrib/file/src/Makefile.am
    M contrib/file/src/Makefile.in
    M contrib/file/src/apprentice.c
    M contrib/file/src/ascmagic.c
    M contrib/file/src/buffer.c
    M contrib/file/src/compress.c
    M contrib/file/src/encoding.c
    M contrib/file/src/file.c
    M contrib/file/src/file.h
    M contrib/file/src/file_opts.h
    M contrib/file/src/fsmagic.c
    M contrib/file/src/funcs.c
    A contrib/file/src/is_csv.c
    M contrib/file/src/magic.h.in
    M contrib/file/src/readcdf.c
    M contrib/file/src/readelf.c
    M contrib/file/src/seccomp.c
    M contrib/file/src/vasprintf.c
    M contrib/file/tests/JW07022A.mp3.result
    M contrib/file/tests/Makefile.in
    M contrib/file/tests/test.c
    M lib/libc/nls/msgcat.c
    M lib/libmagic/Makefile
    M lib/libmagic/config.h
    A release/scripts/make-pkg-package.sh
    A release/scripts/pkg-stage.sh
    M sys/amd64/linux/linux.h
    M sys/amd64/linux32/linux.h
    M sys/amd64/vmm/intel/vmx.c
    M sys/amd64/vmm/io/vlapic.c
    M sys/amd64/vmm/io/vlapic.h
    M sys/compat/freebsd32/freebsd32.h
    M sys/compat/linux/linux_ioctl.c
    M sys/compat/linux/linux_timer.h
    M sys/conf/files.amd64
    M sys/conf/files.i386
    M sys/conf/kern.post.mk
    M sys/conf/kmod.mk
    M sys/dev/ipmi/ipmi.c
    M sys/dev/mpr/mpr_user.c
    M sys/dev/mps/mps_user.c
    M sys/dev/mpt/mpt_user.c
    M sys/dev/ocs_fc/ocs_device.c
    M sys/i386/linux/linux.h
    M sys/kern/kern_clocksource.c
    M sys/kern/sysv_sem.c
    M sys/kern/sysv_shm.c
    M sys/modules/linux/Makefile
    M sys/modules/linux64/Makefile
    M sys/modules/vmm/Makefile
    M sys/net80211/ieee80211_output.c
    A sys/sys/abi_compat.h
    M sys/sys/types.h
    M usr.bin/diff/diff.1
    M usr.bin/diff/diff.c
    M usr.bin/diff/diffreg.c
    M usr.bin/diff/tests/diff_test.sh
    M usr.bin/diff/xmalloc.c

  Log Message:
  -----------
  Merge branch 'master' of github.com:MidnightBSD/src into master


Compare: https://github.com/MidnightBSD/src/compare/8aaf41b145aa...d1db107c23c5