[packages/kernel] Up to 6.16.6
arekm
arekm at pld-linux.org
Tue Sep 9 23:13:59 CEST 2025
commit 2208fb383b9de5281028148f885cc643fc470d0d
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Tue Sep 9 23:13:50 2025 +0200
Up to 6.16.6
kernel-aufs.patch | 92 +++++++++++++++++++++++++++----------------------------
kernel.spec | 5 +--
update-source.sh | 4 +--
3 files changed, 51 insertions(+), 50 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 7f7d90bf..be267b8f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -53,7 +53,7 @@
%define rel 1
%define basever 6.16
-%define postver .5
+%define postver .6
# define this to '-%{basever}' for longterm branch
%define versuffix %{nil}
@@ -107,7 +107,7 @@ Source0: https://www.kernel.org/pub/linux/kernel/v6.x/linux-%{basever}.tar.xz
# Source0-md5: dd850269c3f456c0ff5518b1a2a81836
%if "%{postver}" != ".0"
Patch0: https://www.kernel.org/pub/linux/kernel/v6.x/patch-%{version}.xz
-# Patch0-md5: d5f5585ded5abc846a51e3d9781fa6cf
+# Patch0-md5: e4e57c716fd8c61d619d9dec4527c282
%endif
Source1: kernel.sysconfig
@@ -902,6 +902,7 @@ for a in \
devname \
softdep \
symbols{,.bin} \
+ weakdep \
; do
test -f $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.$a
> $RPM_BUILD_ROOT/lib/modules/%{kernel_release}/modules.$a
diff --git a/kernel-aufs.patch b/kernel-aufs.patch
index d9381445..7e91c644 100644
--- a/kernel-aufs.patch
+++ b/kernel-aufs.patch
@@ -1,5 +1,5 @@
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN kbuild patch
+aufs6.16 kbuild patch
diff --git a/fs/Kconfig b/fs/Kconfig
index 44b6cdd36dc16..d571db04dfe9d 100644
@@ -23,10 +23,10 @@ index 79c08b914c474..dcd049ca86b77 100644
obj-$(CONFIG_RESCTRL_FS) += resctrl/
+obj-$(CONFIG_AUFS_FS) += aufs/
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN base patch
+aufs6.16 base patch
diff --git a/MAINTAINERS b/MAINTAINERS
-index 4bac4ea21b644..9398d61aef93d 100644
+index c0b444e5fd5ad..65367aa9747af 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3943,6 +3943,19 @@ S: Supported
@@ -50,10 +50,10 @@ index 4bac4ea21b644..9398d61aef93d 100644
M: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
R: Dave Ertman <david.m.ertman at intel.com>
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 500840e4a74ef..1e879e5d7cc88 100644
+index 8d994cae3b83b..f4fbdf6c64117 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
-@@ -621,6 +621,26 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -620,6 +620,26 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
goto done;
}
@@ -156,7 +156,7 @@ index 4d6df083e0c06..73cd917c821fe 100644
{
if (unlikely(!out->f_op->splice_write))
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index b085f161ed221..905c976a603a7 100644
+index 040c0036320fd..5a4ba4c04cd98 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -1223,6 +1223,7 @@ extern void fasync_free(struct fasync_struct *);
@@ -243,7 +243,7 @@ index dd2bbf73718b0..e3a5bfdb88c62 100644
#ifdef CONFIG_LOCK_STAT
static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats);
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN mmap patch
+aufs6.16 mmap patch
diff --git a/fs/proc/base.c b/fs/proc/base.c
index c667702dc69b8..3ea53a8ca3f9f 100644
@@ -275,7 +275,7 @@ index c6e7ebc637562..d7ccfd9097646 100644
ino = inode->i_ino;
}
diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c
-index 4be91eb6ea5ca..a6f2d73750f80 100644
+index 751479eb128f0..7f26002f448f0 100644
--- a/fs/proc/task_mmu.c
+++ b/fs/proc/task_mmu.c
@@ -264,7 +264,8 @@ static void get_vma_name(struct vm_area_struct *vma,
@@ -324,7 +324,7 @@ index 59bfd61d653aa..95dc1673366a4 100644
ino = inode->i_ino;
pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT;
diff --git a/include/linux/mm.h b/include/linux/mm.h
-index 0ef2ba0c667af..e88ddcbbc8530 100644
+index fa538feaa8d95..716f3d5e5d8b8 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2438,6 +2438,54 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping,
@@ -702,7 +702,7 @@ index 8e53c7943561e..13fb5979c63a1 100644
vm_flags_init(dest, src->vm_flags);
memcpy(&dest->vm_page_prot, &src->vm_page_prot,
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN standalone patch
+aufs6.16 standalone patch
diff --git a/fs/dcache.c b/fs/dcache.c
index 7f483c97810f2..7f1b9af1355be 100644
@@ -725,10 +725,10 @@ index 7f483c97810f2..7f1b9af1355be 100644
/**
* d_ancestor - search for an ancestor
diff --git a/fs/exec.c b/fs/exec.c
-index 1f5fdd2e096e3..34d831a775c13 100644
+index ba400aafd6406..31f0a6e5acaca 100644
--- a/fs/exec.c
+++ b/fs/exec.c
-@@ -117,6 +117,7 @@ bool path_noexec(const struct path *path)
+@@ -120,6 +120,7 @@ bool path_noexec(const struct path *path)
return (path->mnt->mnt_flags & MNT_NOEXEC) ||
(path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC);
}
@@ -4794,7 +4794,7 @@ diff -urN /usr/share/empty/fs/aufs/conf.mk linux/fs/aufs/conf.mk
+-include ${srctree}/${src}/conf_priv.mk
diff -urN /usr/share/empty/fs/aufs/cpup.c linux/fs/aufs/cpup.c
--- /usr/share/empty/fs/aufs/cpup.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/cpup.c 2025-07-31 17:41:30.156472983 +0200
++++ linux/fs/aufs/cpup.c 2025-09-09 22:51:05.449999973 +0200
@@ -0,0 +1,1466 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -6369,7 +6369,7 @@ diff -urN /usr/share/empty/fs/aufs/cpup.h linux/fs/aufs/cpup.h
+#endif /* __AUFS_CPUP_H__ */
diff -urN /usr/share/empty/fs/aufs/dbgaufs.c linux/fs/aufs/dbgaufs.c
--- /usr/share/empty/fs/aufs/dbgaufs.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dbgaufs.c 2025-07-31 17:41:30.156472983 +0200
++++ linux/fs/aufs/dbgaufs.c 2025-09-09 22:51:05.449999973 +0200
@@ -0,0 +1,525 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -8009,7 +8009,7 @@ diff -urN /usr/share/empty/fs/aufs/debug.h linux/fs/aufs/debug.h
+#endif /* __AUFS_DEBUG_H__ */
diff -urN /usr/share/empty/fs/aufs/dentry.c linux/fs/aufs/dentry.c
--- /usr/share/empty/fs/aufs/dentry.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dentry.c 2025-07-31 17:41:30.159806316 +0200
++++ linux/fs/aufs/dentry.c 2025-09-09 22:51:34.576666640 +0200
@@ -0,0 +1,1228 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -12444,7 +12444,7 @@ diff -urN /usr/share/empty/fs/aufs/dirren.h linux/fs/aufs/dirren.h
+#endif /* __AUFS_DIRREN_H__ */
diff -urN /usr/share/empty/fs/aufs/dynop.c linux/fs/aufs/dynop.c
--- /usr/share/empty/fs/aufs/dynop.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/dynop.c 2025-07-31 17:41:30.586472983 +0200
++++ linux/fs/aufs/dynop.c 2025-09-09 22:51:05.453333307 +0200
@@ -0,0 +1,364 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -12893,7 +12893,7 @@ diff -urN /usr/share/empty/fs/aufs/dynop.h linux/fs/aufs/dynop.h
+#endif /* __AUFS_DYNOP_H__ */
diff -urN /usr/share/empty/fs/aufs/export.c linux/fs/aufs/export.c
--- /usr/share/empty/fs/aufs/export.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/export.c 2025-07-31 17:41:30.586472983 +0200
++++ linux/fs/aufs/export.c 2025-09-09 22:51:05.453333307 +0200
@@ -0,0 +1,828 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -14155,7 +14155,7 @@ diff -urN /usr/share/empty/fs/aufs/fhsm.c linux/fs/aufs/fhsm.c
+}
diff -urN /usr/share/empty/fs/aufs/file.c linux/fs/aufs/file.c
--- /usr/share/empty/fs/aufs/file.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/file.c 2025-07-31 17:41:30.586472983 +0200
++++ linux/fs/aufs/file.c 2025-09-09 22:51:34.576666640 +0200
@@ -0,0 +1,854 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -15510,7 +15510,7 @@ diff -urN /usr/share/empty/fs/aufs/finfo.c linux/fs/aufs/finfo.c
+}
diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
--- /usr/share/empty/fs/aufs/f_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/f_op.c 2025-02-04 20:03:40.676605172 +0100
++++ linux/fs/aufs/f_op.c 2025-09-09 22:51:34.576666640 +0200
@@ -0,0 +1,782 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -16296,7 +16296,7 @@ diff -urN /usr/share/empty/fs/aufs/f_op.c linux/fs/aufs/f_op.c
+};
diff -urN /usr/share/empty/fs/aufs/fsctx.c linux/fs/aufs/fsctx.c
--- /usr/share/empty/fs/aufs/fsctx.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/fsctx.c 2025-07-24 19:31:57.793180791 +0200
++++ linux/fs/aufs/fsctx.c 2025-09-09 22:51:34.579999974 +0200
@@ -0,0 +1,1244 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -19940,7 +19940,7 @@ diff -urN /usr/share/empty/fs/aufs/inode.c linux/fs/aufs/inode.c
+}
diff -urN /usr/share/empty/fs/aufs/inode.h linux/fs/aufs/inode.h
--- /usr/share/empty/fs/aufs/inode.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/inode.h 2025-07-31 17:41:30.159806316 +0200
++++ linux/fs/aufs/inode.h 2025-09-09 22:51:05.456666640 +0200
@@ -0,0 +1,727 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -20895,7 +20895,7 @@ diff -urN /usr/share/empty/fs/aufs/ioctl.c linux/fs/aufs/ioctl.c
+#endif
diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
--- /usr/share/empty/fs/aufs/i_op_add.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op_add.c 2025-07-31 17:41:30.159806316 +0200
++++ linux/fs/aufs/i_op_add.c 2025-09-09 22:51:05.456666640 +0200
@@ -0,0 +1,979 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -21878,7 +21878,7 @@ diff -urN /usr/share/empty/fs/aufs/i_op_add.c linux/fs/aufs/i_op_add.c
+}
diff -urN /usr/share/empty/fs/aufs/i_op.c linux/fs/aufs/i_op.c
--- /usr/share/empty/fs/aufs/i_op.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/i_op.c 2025-07-31 17:41:30.159806316 +0200
++++ linux/fs/aufs/i_op.c 2025-09-09 22:51:05.456666640 +0200
@@ -0,0 +1,1522 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -25840,7 +25840,7 @@ diff -urN /usr/share/empty/fs/aufs/magic.mk linux/fs/aufs/magic.mk
+endif
diff -urN /usr/share/empty/fs/aufs/Makefile linux/fs/aufs/Makefile
--- /usr/share/empty/fs/aufs/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/Makefile 2025-07-31 17:41:30.156472983 +0200
++++ linux/fs/aufs/Makefile 2025-09-09 22:51:05.449999973 +0200
@@ -0,0 +1,47 @@
+# SPDX-License-Identifier: GPL-2.0
+
@@ -30034,7 +30034,7 @@ diff -urN /usr/share/empty/fs/aufs/sbinfo.c linux/fs/aufs/sbinfo.c
+}
diff -urN /usr/share/empty/fs/aufs/super.c linux/fs/aufs/super.c
--- /usr/share/empty/fs/aufs/super.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/super.c 2025-07-31 17:41:30.159806316 +0200
++++ linux/fs/aufs/super.c 2025-09-09 22:51:34.579999974 +0200
@@ -0,0 +1,872 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -33175,7 +33175,7 @@ diff -urN /usr/share/empty/fs/aufs/vdir.c linux/fs/aufs/vdir.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
--- /usr/share/empty/fs/aufs/vfsub.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.c 2025-07-31 17:41:30.586472983 +0200
++++ linux/fs/aufs/vfsub.c 2025-09-09 22:51:34.579999974 +0200
@@ -0,0 +1,972 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -34151,7 +34151,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.c linux/fs/aufs/vfsub.c
+}
diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
--- /usr/share/empty/fs/aufs/vfsub.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/vfsub.h 2025-07-31 17:41:30.159806316 +0200
++++ linux/fs/aufs/vfsub.h 2025-09-09 22:51:05.459999974 +0200
@@ -0,0 +1,441 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/*
@@ -34596,7 +34596,7 @@ diff -urN /usr/share/empty/fs/aufs/vfsub.h linux/fs/aufs/vfsub.h
+#endif /* __AUFS_VFSUB_H__ */
diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
--- /usr/share/empty/fs/aufs/wbr_policy.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/wbr_policy.c 2025-07-31 17:41:30.159806316 +0200
++++ linux/fs/aufs/wbr_policy.c 2025-09-09 22:51:05.459999974 +0200
@@ -0,0 +1,835 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -35435,7 +35435,7 @@ diff -urN /usr/share/empty/fs/aufs/wbr_policy.c linux/fs/aufs/wbr_policy.c
+};
diff -urN /usr/share/empty/fs/aufs/whout.c linux/fs/aufs/whout.c
--- /usr/share/empty/fs/aufs/whout.c 1970-01-01 01:00:00.000000000 +0100
-+++ linux/fs/aufs/whout.c 2025-07-31 17:41:30.159806316 +0200
++++ linux/fs/aufs/whout.c 2025-09-09 22:51:05.459999974 +0200
@@ -0,0 +1,1096 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
@@ -39387,7 +39387,7 @@ diff -urN /usr/share/empty/fs/aufs/xino.c linux/fs/aufs/xino.c
+}
diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/linux/aufs_type.h
--- /usr/share/empty/include/uapi/linux/aufs_type.h 1970-01-01 01:00:00.000000000 +0100
-+++ linux/include/uapi/linux/aufs_type.h 2025-07-31 17:41:30.586472983 +0200
++++ linux/include/uapi/linux/aufs_type.h 2025-09-09 22:51:34.579999974 +0200
@@ -0,0 +1,452 @@
+/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
+/*
@@ -39431,7 +39431,7 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+#include <limits.h>
+#endif /* __KERNEL__ */
+
-+#define AUFS_VERSION "6.x-rcN-20250707"
++#define AUFS_VERSION "6.16-20250804"
+
+/* todo? move this to linux-2.6.19/include/magic.h */
+#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's')
@@ -39842,10 +39842,10 @@ diff -urN /usr/share/empty/include/uapi/linux/aufs_type.h linux/include/uapi/lin
+
+#endif /* __AUFS_TYPE_H__ */
SPDX-License-Identifier: GPL-2.0
-aufs6.x-rcN loopback patch
+aufs6.16 loopback patch
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
-index 1e879e5d7cc88..bdadcca492f08 100644
+index f4fbdf6c64117..904ac895ddd7d 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -52,7 +52,7 @@ struct loop_device {
@@ -39857,7 +39857,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
unsigned int lo_min_dio_size;
struct block_device *lo_device;
-@@ -432,6 +432,15 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
+@@ -431,6 +431,15 @@ static int do_req_filebacked(struct loop_device *lo, struct request *rq)
}
}
@@ -39873,7 +39873,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
static void loop_reread_partitions(struct loop_device *lo)
{
int rc;
-@@ -533,6 +542,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -532,6 +541,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
{
struct file *file = fget(arg);
struct file *old_file;
@@ -39881,7 +39881,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
unsigned int memflags;
int error;
bool partscan;
-@@ -561,11 +571,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -560,11 +570,19 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
if (!(lo->lo_flags & LO_FLAGS_READ_ONLY))
goto out_err;
@@ -39901,7 +39901,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
error = -EINVAL;
-@@ -585,6 +603,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -584,6 +602,7 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
memflags = blk_mq_freeze_queue(lo->lo_queue);
mapping_set_gfp_mask(old_file->f_mapping, lo->old_gfp_mask);
loop_assign_backing_file(lo, file);
@@ -39909,7 +39909,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
loop_update_dio(lo);
blk_mq_unfreeze_queue(lo->lo_queue, memflags);
partscan = lo->lo_flags & LO_FLAGS_PARTSCAN;
-@@ -604,6 +623,9 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -603,6 +622,9 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
* dependency.
*/
fput(old_file);
@@ -39919,7 +39919,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 0);
if (partscan)
loop_reread_partitions(lo);
-@@ -617,6 +639,9 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
+@@ -616,6 +638,9 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev,
loop_global_unlock(lo, is_loop);
out_putf:
fput(file);
@@ -39929,7 +39929,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 0);
goto done;
}
-@@ -994,6 +1019,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -993,6 +1018,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
const struct loop_config *config)
{
struct file *file = fget(config->fd);
@@ -39937,7 +39937,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
struct queue_limits lim;
int error;
loff_t size;
-@@ -1012,6 +1038,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1011,6 +1037,13 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
/* This is safe, since we have a reference from open(). */
__module_get(THIS_MODULE);
@@ -39951,7 +39951,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
/*
* If we don't hold exclusive handle for the device, upgrade to it
* here to avoid changing device under exclusive owner.
-@@ -1066,6 +1099,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1065,6 +1098,7 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
lo->lo_device = bdev;
loop_assign_backing_file(lo, file);
@@ -39959,7 +39959,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
lim = queue_limits_start_update(lo->lo_queue);
loop_update_limits(lo, &lim, config->block_size);
-@@ -1116,6 +1150,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
+@@ -1115,6 +1149,8 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode,
bd_abort_claiming(bdev, loop_configure);
out_putf:
fput(file);
@@ -39968,7 +39968,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
/* This is safe: open() is still holding a reference. */
module_put(THIS_MODULE);
return error;
-@@ -1125,11 +1161,13 @@ static void __loop_clr_fd(struct loop_device *lo)
+@@ -1124,11 +1160,13 @@ static void __loop_clr_fd(struct loop_device *lo)
{
struct queue_limits lim;
struct file *filp;
@@ -39982,7 +39982,7 @@ index 1e879e5d7cc88..bdadcca492f08 100644
spin_unlock_irq(&lo->lo_lock);
lo->lo_device = NULL;
-@@ -1196,6 +1234,8 @@ static void __loop_clr_fd(struct loop_device *lo)
+@@ -1195,6 +1233,8 @@ static void __loop_clr_fd(struct loop_device *lo)
* fput can take open_mutex which is usually taken before lo_mutex.
*/
fput(filp);
@@ -40067,7 +40067,7 @@ index e867aa6e757a6..4a4f96e294315 100644
/* ---------------------------------------------------------------------- */
diff --git a/include/linux/fs.h b/include/linux/fs.h
-index 905c976a603a7..7c9e30264745f 100644
+index 5a4ba4c04cd98..926501908120b 100644
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2370,6 +2370,11 @@ struct super_operations {
diff --git a/update-source.sh b/update-source.sh
index ba497954..7a618513 100755
--- a/update-source.sh
+++ b/update-source.sh
@@ -1,8 +1,8 @@
#!/bin/sh
set -xe
-#BRANCH=aufs6.16
-BRANCH=aufs6.x-rcN
+BRANCH=aufs6.16
+#BRANCH=aufs6.x-rcN
# aufs6
[ -d aufs-standalone ] || git clone https://github.com/sfjro/aufs-standalone.git
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/2208fb383b9de5281028148f885cc643fc470d0d
More information about the pld-cvs-commit
mailing list