Merge remote-tracking branch 'upstream/master' into cpu-fanotify-linux-bindings

Author: cpu

src/unix/linux_like/linux/gnu/mod.rs

@@ -1198,7 +1198,6 @@ extern "C" {
     pub fn ntp_adjtime(buf: *mut timex) -> ::c_int;
     #[link_name = "ntp_gettimex"]
     pub fn ntp_gettime(buf: *mut ntptimeval) -> ::c_int;
-
     pub fn copy_file_range(
         fd_in: ::c_int,
         off_in: *mut ::off64_t,
@@ -1207,7 +1206,6 @@ extern "C" {
         len: ::size_t,
         flags: ::c_uint,
     ) -> ::ssize_t;
-
     pub fn fanotify_mark(
         fd: ::c_int,
         flags: ::c_uint,