Merge remote-tracking branch 'upstream/master' after all FreeBSD

related changes have been merged from upstream.

diff --cc src/dvb/dvb_adapter.c
index ff10cb1d7a63d5243cc10384663fb62945c32ba7,93f06cdbd2130cb96f482df3a53c104f8c0f8cad..de4a59a59a9e63aeeef431d3d31fe4a3538327b4
--- 1/src/dvb/dvb_adapter.c
--- 2/src/dvb/dvb_adapter.c
+++ b/src/dvb/dvb_adapter.c
@@@ -47,14 -47,8 +47,15 @@@
  #include "epggrab.h"
  #include "diseqc.h"
  #include "atomic.h"
+ #include "tvhpoll.h"
  
 +#if ENABLE_EPOLL
 +#include <sys/epoll.h>
 +#elif ENABLE_KQUEUE
 +#include <sys/event.h>
 +#include <sys/time.h>
 +#endif
 +
  struct th_dvb_adapter_queue dvb_adapters;
  struct th_dvb_mux_instance_tree dvb_muxes;
  static void *dvb_adapter_input_dvr(void *aux);

diff --cc src/timeshift/timeshift_reader.c
Simple merge