diff -Nru glibc-2.27/debian/changelog glibc-2.27/debian/changelog
--- glibc-2.27/debian/changelog	2018-04-16 17:14:20.000000000 -0300
+++ glibc-2.27/debian/changelog	2020-06-18 17:17:09.000000000 -0300
@@ -1,3 +1,12 @@
+glibc (2.27-3ubuntu1.1) bionic; urgency=medium
+
+  * debian/patches/ubuntu/test-disable-copy_file_range-cross_device_failure.patch:
+    disable cross_device_failure test for copy_file_range (LP: #1853193)
+  * debian/patches/ubuntu/test-make-preadwritev2-invalid-flag-unsupported.patch:
+    make preadwritev2 invalid flags tests unsupported (LP: #1770480)
+
+ -- Thadeu Lima de Souza Cascardo <cascardo@canonical.com>  Thu, 18 Jun 2020 17:17:09 -0300
+
 glibc (2.27-3ubuntu1) bionic; urgency=medium
 
   * Merge with Debian, with packaging tweaks and master updated to 2018-03-29.
diff -Nru glibc-2.27/debian/patches/series glibc-2.27/debian/patches/series
--- glibc-2.27/debian/patches/series	2018-04-16 17:02:50.000000000 -0300
+++ glibc-2.27/debian/patches/series	2020-06-18 17:12:26.000000000 -0300
@@ -197,3 +197,5 @@
 ubuntu/localedata/git-pt-fmt.diff
 ubuntu/localedata/sd_PK.diff
 ubuntu/localedata/ug_CN@latin.diff
+ubuntu/test-disable-copy_file_range-cross_device_failure.patch
+ubuntu/test-make-preadwritev2-invalid-flag-unsupported.patch
diff -Nru glibc-2.27/debian/patches/ubuntu/test-disable-copy_file_range-cross_device_failure.patch glibc-2.27/debian/patches/ubuntu/test-disable-copy_file_range-cross_device_failure.patch
--- glibc-2.27/debian/patches/ubuntu/test-disable-copy_file_range-cross_device_failure.patch	1969-12-31 21:00:00.000000000 -0300
+++ glibc-2.27/debian/patches/ubuntu/test-disable-copy_file_range-cross_device_failure.patch	2020-06-18 17:17:09.000000000 -0300
@@ -0,0 +1,36 @@
+Author: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+Forwarded: no
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1853193
+Subject: disable cross_device_failure test for copy_file_range
+ copy_file_range does not return EXDEV anymore when doing cross filesystems
+ copy on newer kernels. Upstream glibc removed copy_file_range emulation
+ support, which we are not backporting to bionic.
+Index: glibc-2.27/io/tst-copy_file_range.c
+===================================================================
+--- glibc-2.27.orig/io/tst-copy_file_range.c
++++ glibc-2.27/io/tst-copy_file_range.c
+@@ -452,6 +452,7 @@ delayed_write_failure_end (void)
+     }
+ }
+ 
++#if 0
+ /* Test a write failure across devices.  */
+ static void
+ cross_device_failure (void)
+@@ -475,6 +476,7 @@ cross_device_failure (void)
+ 
+   xclose (xdevfd);
+ }
++#endif
+ 
+ /* Try to exercise ENOSPC behavior with a tempfs file system (so that
+    we do not have to fill up a regular file system to get the error).
+@@ -726,7 +728,7 @@ static struct test_case tests[] =
+     { "delayed_write_failure_beginning", delayed_write_failure_beginning,
+       .sizes = true },
+     { "delayed_write_failure_end", delayed_write_failure_end, .sizes = true },
+-    { "cross_device_failure", cross_device_failure, .sizes = true },
++//    { "cross_device_failure", cross_device_failure, .sizes = true },
+     { "enospc_failure", enospc_failure, },
+     { "oappend_failure", oappend_failure, .sizes = true },
+     { "short_copy", short_copy, .sizes = true },
diff -Nru glibc-2.27/debian/patches/ubuntu/test-make-preadwritev2-invalid-flag-unsupported.patch glibc-2.27/debian/patches/ubuntu/test-make-preadwritev2-invalid-flag-unsupported.patch
--- glibc-2.27/debian/patches/ubuntu/test-make-preadwritev2-invalid-flag-unsupported.patch	1969-12-31 21:00:00.000000000 -0300
+++ glibc-2.27/debian/patches/ubuntu/test-make-preadwritev2-invalid-flag-unsupported.patch	2020-06-18 17:16:44.000000000 -0300
@@ -0,0 +1,31 @@
+Author: Thadeu Lima de Souza Cascardo <cascardo@canonical.com>
+Forwarded: no
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/glibc/+bug/1770480
+Subject: make preadwritev2 invalid flags tests unsupported
+ New kernels allow new flags for preadv2 and pwritev2. Instead of failing
+ and exiting when those test succeeds or fail with an error different from
+ unsupported, fail with unsupported, which is equivalent to skipping the
+ test instead of failing it.
+Index: glibc-2.27/misc/tst-preadvwritev2-common.c
+===================================================================
+--- glibc-2.27.orig/misc/tst-preadvwritev2-common.c
++++ glibc-2.27/misc/tst-preadvwritev2-common.c
+@@ -42,14 +42,14 @@ do_test_with_invalid_flags (void)
+   char buf[32];
+   const struct iovec vec = { .iov_base = buf, .iov_len = sizeof (buf) };
+   if (preadv2 (temp_fd, &vec, 1, 0, invalid_flag) != -1)
+-    FAIL_EXIT1 ("preadv2 did not fail with an invalid flag");
++    FAIL_UNSUPPORTED ("preadv2 did not fail with an invalid flag");
+   if (errno != ENOTSUP)
+-    FAIL_EXIT1 ("preadv2 failure did not set errno to ENOTSUP (%d)", errno);
++    FAIL_UNSUPPORTED ("preadv2 failure did not set errno to ENOTSUP (%d)", errno);
+ 
+   /* This might fail for compat syscall (32 bits running on 64 bits kernel)
+      due a kernel issue.  */
+   if (pwritev2 (temp_fd, &vec, 1, 0, invalid_flag) != -1)
+-    FAIL_EXIT1 ("pwritev2 did not fail with an invalid flag");
++    FAIL_UNSUPPORTED ("pwritev2 did not fail with an invalid flag");
+   if (errno != ENOTSUP)
+-    FAIL_EXIT1 ("pwritev2 failure did not set errno to ENOTSUP (%d)", errno);
++    FAIL_UNSUPPORTED ("pwritev2 failure did not set errno to ENOTSUP (%d)", errno);
+ }