Conflicts:
	OTP_VERSION
	erts/doc/src/notes.xml
	erts/vsn.mk
	lib/kernel/doc/src/notes.xml
	lib/kernel/src/kernel.appup.src
	lib/kernel/vsn.mk
	lib/ssl/doc/src/notes.xml
	lib/ssl/src/ssl.appup.src
	lib/ssl/src/ssl_cipher.erl
	lib/ssl/vsn.mk
	otp_versions.table

* soranoba/fix-file-position/PR-646:
  Unify internal error handling
  Fix file:pread and :pwrite to use character encoding
  Clean up code for file:position/2
  Fix file:position (not raw mode)

OTP-13155

A new {line_delimiter, byte()} option allows line-oriented TCP-based
protocols to use a custom line delimiting character. It is to be
used in conjunction with {packet, line}.

This option also works with erlang:decode_packet/3 when its first argument
is 'line'.

Several users on erlang-questions have reported problems with recent
releases where output to standard_error causes standard_error_sup to
die from receiving an unexpected eagain error. In the fd_driver,
change the fd_async() function to handle EINTR, and change
fd_ready_async() to handle ERRNO_BLOCK. Add a new test to
standard_error_SUITE to generate output to standard_error and ensure
that standard_error_sup does not die. Thanks to Kota Uenishi for
contributing the test case.

* egil/cuddle-tests:
  kernel: Remove ?line macros in inet_SUITE:t_gethostbyaddr/1
  erts: Tweak statistics_SUITE:scheduler_wall_time/1