Resolved merge conflicts

diff --cc Makefile
index da6311c63ee473d888b67f9888d6d371780ff6a0,bcf526f2d38f69a3df666b744799cf4f730c6702..7542628169c15364ae795052d04387b96d6cb130
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -1,7 -1,7 +1,7 @@@
  # Note: Compiling kernel modules requires creating symlinks, which is not possible on certain 
  # filesystems (notably VirtualBox vmfs); therefore we allow using /run/ through the 'symlink' target,
  # if necessary.
-- 
++
  MODULES_DIR_PATH = ${PWD}/modules/
  MODULES_LIST = unipi/ rtc-unipi/
  
@@@ -9,24 -9,24 +9,24 @@@
  #default: symlink ;
  default: all ;
  
--all: 
++all:
        for m in ${MODULES_LIST}; do\
                cd ${MODULES_DIR_PATH}$$m; make all || exit 1;\
                done
  
  modules_install: install ;
  
--install: 
++install:
        for m in ${MODULES_LIST}; do\
                cd ${MODULES_DIR_PATH}$$m; make modules_install INSTALL_MOD_PATH=${DESTDIR} || exit 1;\
                done
  
  dkms:
        for m in ${MODULES_LIST}; do\
 -              cd ${MODULES_DIR_PATH}$$m; make dkms INSTALL_MOD_PATH=${DESTDIR}/$$m  || exit 1;\
 +              cd ${MODULES_DIR_PATH}$$m; make dkms INSTALL_MOD_PATH=${DESTDIR}/$$m || exit 1;\
                done
  
--clean: 
++clean:
        for m in ${MODULES_LIST}; do\
                cd ${MODULES_DIR_PATH}$$m; make clean;\
                done

diff --cc modules/unipi/src/unipi_uart.c
index 0facb35375d1ec167262acfce98e4cbb691f83de,f86b2db1fd676acca26798c6bcc3459ed6876aa5..3c87c232250f8dc6a77944e35a2073bd86446425
--- 1/modules/unipi/src/unipi_uart.c
--- 2/modules/unipi/src/unipi_uart.c
+++ b/modules/unipi/src/unipi_uart.c
@@@ -311,16 -338,18 +338,17 @@@ void neuronspi_uart_handle_rx(struct ne
  
        if (rxlen) {
                spin_lock_irqsave(&port->port.lock, flags);
-               port->port.icount.rx++;
-               flag = TTY_NORMAL;
-               for (i = 0; i < rxlen; ++i) {
- 
-                       ch = *pbuf;
-             pbuf++;
-                       if (uart_handle_sysrq_char(&port->port, ch))
-                               continue;
- 
-                       uart_insert_char(&port->port, 0, 0, ch, flag);
+               if (port->accept_rx) {
+                       port->port.icount.rx++;
+                       flag = TTY_NORMAL;
+                       for (i = 0; i < rxlen; ++i) {
 -
+                               ch = *pbuf;
 -              pbuf++;
++                              pbuf++;
+                               if (uart_handle_sysrq_char(&port->port, ch))
+                                       continue;
+ 
+                               uart_insert_char(&port->port, 0, 0, ch, flag);
+                       }
                }
                spin_unlock_irqrestore(&port->port.lock, flags);
        }