diff --git a/Documentation/releases/v2.25-ReleaseNotes b/Documentation/releases/v2.25-ReleaseNotes
index 46fd788b8..f015479ce 100644
--- a/Documentation/releases/v2.25-ReleaseNotes
+++ b/Documentation/releases/v2.25-ReleaseNotes
@@ -108,6 +108,10 @@ agetty:
    - support the special terminal on first serial line on a S/390  [Werner Fink]
    - update man page  [Karel Zak]
    - use the "best" interface for \4 and \6  [Karel Zak]
+bash-completion:
+   - update cfdisk  [Karel Zak]
+   - update fallocate, fstrim and lsblk  [Karel Zak]
+   - update fdisk  [Karel Zak]
 blkdiscard:
    - BLKSSZGET fills in an int, not a uint64  [Theodore Ts'o]
 blkid:
@@ -139,6 +143,7 @@ build-sys:
    - add UL_DEFAULT_ENABLE() and $ul_default_estate  [Karel Zak]
    - add UL_EXCLUDE_ARCH()  [Karel Zak]
    - add disable-all.conf to config-gen  [Karel Zak]
+   - add libsmartcols to ko-release-gen script  [Karel Zak]
    - add missing dependencies to libsmartcols  [Karel Zak]
    - add non-libsmartcols.conf  [Karel Zak]
    - add sys-utils/uname26.8 to gitignore  [Karel Zak]
@@ -159,16 +164,19 @@ build-sys:
    - fix typo, sparc vs spark (62b2c024)  [Ruediger Meier]
    - fix update-potfiles script  [Ruediger Meier]
    - fix with_python usage, improve logic  [Karel Zak]
+   - fixes for non-Linux systems  [Samuel Thibault]
    - fstrim depends on libmount  [Karel Zak]
    - libmount/python/__init__.py is always a dist file  [Ruediger Meier]
    - move libsmartcols.so to /lib if they exists  [Karel Zak]
    - ove fdisks to disk-utils  [Karel Zak]
+   - release++ (v2.25-rc1)  [Karel Zak]
    - remove deprecated-mount/  [Karel Zak]
    - remove obsolete wholedisk.c  [Karel Zak]
    - remove unnecessary void casts  [Sami Kerola]
    - restore make distcheck's configure flags  [Ruediger Meier]
    - small fixes to libsmartcols  [Karel Zak]
    - sort gitignore files  [Sami Kerola]
+   - support ./configure ADJTIME_PATH=  [Karel Zak]
    - use automake's PYTHON primary for __init__.py  [Ruediger Meier]
    - use gettext 0.18.3 if possible  [Ruediger Meier]
    - fix default estate usage  [Karel Zak]
@@ -197,6 +205,7 @@ cal:
    - use month contents structure for --year printing  [Sami Kerola]
    - various tests for week numbers  [Tommi Kyntola]
 cfdisk:
+   - add --zero command line option  [Karel Zak]
    - add UI for linfdisk menus, ask for size  [Karel Zak]
    - add [Sort] operation  [Karel Zak]
    - add create lebel UI  [Karel Zak]
@@ -211,9 +220,11 @@ cfdisk:
    - coding style, comments, etc.  [Karel Zak]
    - consolidate menu descriptions  [Karel Zak]
    - consolidate menu move code  [Karel Zak]
+   - don't offer BSD  [Karel Zak]
    - fix colors initialization  [Karel Zak]
    - fix compile-time error fixes #59  [Wolfgang Richter]
    - fix compiler warning [-Wsign-compare]  [Karel Zak]
+   - fix division by zero [clang-analyze]  [Karel Zak]
    - fix header  [Karel Zak]
    - fix slang usage  [Karel Zak]
    - fix typo (undeclared variable since b1f58330)  [Ruediger Meier]
@@ -262,11 +273,15 @@ dmesg:
    - support colors customization  [Karel Zak]
 docs:
    - add a new command boilerplate code  [Sami Kerola]
+   - add fdisk mac support to TODO file  [Karel Zak]
    - add lslogins(1) to TODO  [Karel Zak]
+   - add note about lsblk  [Karel Zak]
    - add note about make distcheck  [Karel Zak]
    - add patching process to howto-contribute.txt  [Sami Kerola]
    - add pid alis to deprecated.txt  [Karel Zak]
+   - add v2.25-ReleaseNotes  [Karel Zak]
    - fix "behaviour" vs. "behavior"  [Karel Zak]
+   - fix minor things in man-page howto  [Karel Zak]
    - fix two command representations in the man page of more  [Benno Schulenberg]
    - grammarize the usage howto  [Benno Schulenberg]
    - make hexdump.1 color specification easier to understand  [Sami Kerola]
@@ -287,22 +302,30 @@ fallocate:
    - Hide #ifdef tricks to call fallocate in a function  [Rodrigo Campos]
    - add --verbose, clean up usage()  [Karel Zak]
    - add FALLOC_FL_ZERO_RANGE support  [Lukas Czerner]
+   - clarify usage()  [Pádraig Brady]
    - code optimalizations  [Karel Zak]
+   - fix FALLOC_FL_ZERO_RANGE flag check  [Karel Zak]
+   - fix check of number of arguments  [Bernhard Voelker]
    - fix man page synopsis  [Karel Zak]
    - fix missing sentinel for is_nul()  [Karel Zak]
    - improve --dig-holes  [Karel Zak]
    - introduce an option -c to support COLLAPSE_RANGE  [Dongsu Park]
+   - make man page readable for humans  [Karel Zak]
    - prefer FALLOC_FL_* flags from libc headers  [Karel Zak]
+   - use O_CREAT only for the default behavior  [Karel Zak]
    - use POSIX_FADV_DONTNEED to discard cached data  [Karel Zak]
    - use SEEK_DATA on already sparse files  [Karel Zak]
+   - use err_exclusive_options(), cleanup getopt_long() stuff  [Karel Zak]
 fdformat:
    - Some minor change to the manual  [Bjarni Ingi Gislason]
 fdisk:
    - (gpt) add A,B,R,S expert commands to modify attributes  [Karel Zak]
    - (gpt) more human readable info about free space  [Karel Zak]
    - add 'M' to access GPT nested protective/hybrid MBR  [Karel Zak]
+   - add long options, cleanup man page and usage()  [Karel Zak]
    - add note about colors to the man page  [Karel Zak]
    - don't care about partition type  [Karel Zak]
+   - don't use --geom-* prefix for CHS options  [Karel Zak]
    - fix 'p'rint error on empty PT  [Karel Zak]
    - fix nasty coding style  [Karel Zak]
    - fix printf stuff  [Karel Zak]
@@ -323,7 +346,11 @@ findmnt:
    - add -U to de-deplicate filesystems  [Karel Zak]
    - cleanup flags  [Karel Zak]
    - cleanup usage()  [Karel Zak]
+   - minimally improve wording of usage text  [Benno Schulenberg]
+   - simplify cache_set_targets()  [Karel Zak]
+   - slightly improve wording and formatting in man page  [Benno Schulenberg]
    - use libsmartcols  [Ondrej Oprala]
+   - use mnt_cache_set_targets() for non-kernel table  [Eric Rannaud]
 flock:
    - Change the 'exit status' man page section to make more sense  [Wieland Hoffmann]
    - document exit status of flock in man page  [Phillip Susi]
@@ -332,6 +359,7 @@ fsck:
    - Some typographical corrections to the manual  [Bjarni Ingi Gislason]
    - add ext4 to list of filesystems with progress bars in fsck man page  [Phillip Susi]
    - don't return error if fsck.<type> does not exist  [Karel Zak]
+   - uninitialized argument value [clang-analyze]  [Karel Zak]
    - use private lock file rather than whole-disk directly  [Karel Zak]
 fsck.cramfs:
    - add option --blocksize  [Ruediger Meier]
@@ -402,6 +430,7 @@ hwclock:
    - fix possible hang and other set_hardware_clock_exact() issues  [Chris MacGregor]
    - fix typo  [Karel Zak]
    - internationalizing the message of the used interface  [Benno Schulenberg]
+   - sometimes one day lasts 23 hours.  [peppe]
 include/boottime:
    - add a new file  [Karel Zak]
 include/c:
@@ -495,6 +524,10 @@ lib/fileutils:
    - add mkdir_p() from libmount  [Karel Zak]
    - add stripoff_last_component() from libmount  [Karel Zak]
    - xalloc stuff in library-like code  [Karel Zak]
+lib/ismounted:
+   - more robust buffer usage [clang-analyze]  [Karel Zak]
+lib/loopdev.c:
+   - reset errno before strtol() call  [Yuriy Nazarov]
 lib/mbalign:
    - add mbs_safe_width() from tt.c  [Karel Zak]
    - report also size in bytes  [Karel Zak]
@@ -529,6 +562,7 @@ lib/tt:
    - add tt_line_get_userdata()  [Karel Zak]
    - don't hardcode stdout as output  [Karel Zak]
    - keep track about output order  [Karel Zak]
+lib/tt.c:
    - Goodbye!  [Ondrej Oprala]
 libblkid:
    - (nilfs2) check also backup superblock  [Karel Zak]
@@ -538,11 +572,13 @@ libblkid:
    - add extra checks to XFS prober  [Karel Zak]
    - cleanup internal return codes  [Karel Zak]
    - convert GPT attributes to host endianess  [Karel Zak]
+   - correct the return values in squashfs probe  [David Shea]
    - detect alone PMBR  [Karel Zak]
    - detect squashfs 3 vs 4  [Ruediger Meier]
    - fix compiler warning [-Wimplicit-function-declaration]  [Karel Zak]
    - fix memory leak in blkid_parse_tag_string()  [Karel Zak]
    - fix partitions probing  [Karel Zak]
+   - fix probe_ddf() [clang-analyze]  [Karel Zak]
    - fix return codes from PART_ENTRY_* probing  [Karel Zak]
    - fix sgi PT parser to report system partitions  [Karel Zak]
    - fix swap-area version  [Karel Zak]
@@ -564,13 +600,16 @@ libfdisk:
    - (bsd) remove get_partition_type()  [Karel Zak]
    - (bsd) use new get_part() API  [Karel Zak]
    - (dos) be more verbose when change bootable flag  [Karel Zak]
+   - (dos) calculation of total size based on CHS in check function  [Thorsten Wilmer]
    - (dos) consolidate partition end-offset code  [Karel Zak]
+   - (dos) count fisrt usable LBA to total number of used sectors  [Karel Zak]
    - (dos) fix ext_index usage  [Karel Zak]
    - (dos) fix free part counter  [Karel Zak]
    - (dos) fix log.partition delete  [Karel Zak]
    - (dos) improve logical partition reorder command  [Karel Zak]
    - (dos) make EBR parser more robust  [Karel Zak]
    - (dos) remove get_partition_type()  [Karel Zak]
+   - (dos) use check() for dos-comaptible mode only  [Karel Zak]
    - (dos) use new list() and get_part() API  [Karel Zak]
    - (dos) warn on type 0  [Karel Zak]
    - (gpt) add /home GUID  [Karel Zak]
@@ -618,6 +657,7 @@ libfdisk:
    - fix fdisk_context_assign_device() comment  [Karel Zak]
    - fix freesapce detection for nested partitions  [Karel Zak]
    - fix logical partition reorder command  [Karel Zak]
+   - fix possible memory leak [clang-analyze]  [Karel Zak]
    - fix printf stuff  [Karel Zak]
    - follow requested size rather than use all available space  [Karel Zak]
    - implement generic functions for FDISK_COL_ stuff  [Karel Zak]
@@ -641,7 +681,6 @@ libfdisk:
    - use new debug functions  [Karel Zak]
    - use partition template  [Karel Zak]
    - warn about obsolete signatures on the device  [Karel Zak]
-   - align free space  [Karel Zak]
 libmount:
    - FS id and parent ID could be zero  [Karel Zak]
    - accept (deleted) path suffix in mountinfo file  [Karel Zak]
@@ -650,6 +689,7 @@ libmount:
    - add mnt_tag_is_valid()  [Karel Zak]
    - add statfs_magic.h  [Karel Zak]
    - allow to use -s (sloppy) for all external helpers  [Karel Zak]
+   - always use mnt_resolve_target() in mnt_fs_match_target()  [Karel Zak]
    - cgroup magic already defined  [Karel Zak]
    - cleanup fix_optstr() regards to selinux and smack  [Karel Zak]
    - define BTRFS_TEST_MAGIC if missing  [Bernhard Voelker]
@@ -659,8 +699,12 @@ libmount:
    - further debug.h integration  [Ondrej Oprala]
    - initialize *root to NULL in mnt_table_get_root_fs  [Thomas Bächler]
    - make the mountinfo parser more robust  [Karel Zak]
+   - mnt_resolve_path  don't canonicalize fs->target for swap  [Eric Rannaud]
+   - mnt_resolve_path  use strcmp() only if both are canonical  [Eric Rannaud]
+   - mnt_resolve_target  tiptoe around active mount points  [Eric Rannaud]
    - remove smackfs* option when SMACK not enabled  [Karel Zak]
    - silence some docs warnings  [Ondrej Oprala]
+   - special treatment for auto in fstype pattern  [Karel Zak]
    - update utab after successful extern helper mount  [Karel Zak]
    - use macros from include/debug.h  [Ondrej Oprala]
    - use new debug functions  [Karel Zak]
@@ -677,6 +721,7 @@ libsmartcols:
    - add lines  [Karel Zak, Ondrej Oprala]
    - add missing COPYING file  [Karel Zak]
    - add missing copyright notifications  [Ondrej Oprala]
+   - add note about deallocations  [Karel Zak]
    - add reduce term width functionality  [Karel Zak]
    - add scols_sort_table()  [Karel Zak, Shakur Shams Mullick]
    - add scols_table_is_empty()  [Ondrej Oprala]
@@ -724,6 +769,8 @@ libuuid:
    - (uuid_is_null.3) Improve the typesetting of the manual  [Bjarni Ingi Gislason]
    - (uuid_parse.3) Improve the typesetting of the manual  [Bjarni Ingi Gislason]
    - (uuid_unparse.3) Improve the typesetting of the manual  [Bjarni Ingi Gislason]
+linfdisk:
+   - align free space  [Karel Zak]
 logger:
    - allow user to send structured journald messages  [Sami Kerola]
    - check numeric priority and facility input values  [Sami Kerola]
@@ -799,6 +846,8 @@ lslogins:
    - improve nologins and shadow usage  [Karel Zak]
    - improve pretty output  [Karel Zak]
    - improve supplementary groups code, add SUPP-GIDS  [Karel Zak]
+   - improve the columns information  [Benno Schulenberg]
+   - improve wording and formatting of the man page  [Benno Schulenberg]
    - make it work  [Ondrej Oprala]
    - mention --time-format in usage  [Ondrej Oprala]
    - move to login-utils  [Ondrej Oprala]
@@ -904,8 +953,10 @@ renice:
 runuser:
    - fix minor typos in the man page  [Ondrej Oprala]
 script:
+   - --quiet option is not quiet.  [James Hunt]
    - Also flush writes to timing file.  [Jesper Dahl Nyerup]
    - check that stdin is a terminal  [Karel Zak]
+   - clean up code to genenrate Star/Done messages  [Karel Zak]
    - clean up files usage  [Karel Zak]
    - don't call TIOCGWINSZ in signal handler  [Karel Zak]
    - don't wait for empty descriptors if child is dead  [Karel Zak]
@@ -914,6 +965,7 @@ script:
    - fix spurious exit from input read loop on EINTR.  [Csaba Kos]
    - restore errno in signal handler  [Karel Zak]
    - script input redirection / eof handling  [Karel Zak]
+   - silence the done message on --quiet as well  [Andreas Henriksson]
    - time from end of read() call partially fixes #58  [Wolfgang Richter]
    - use all-io.h to make the code more robust  [Karel Zak]
 scriptreplay:
@@ -942,7 +994,9 @@ setterm:
    - fix 'bright' in usage, remove unnecessary error message  [Karel Zak]
    - fix -dump man page info  [Karel Zak]
    - improve error messages  [Sami Kerola]
+   - improve formatting and wording of usage text  [Benno Schulenberg]
    - improve perform_sequence() coding style  [Sami Kerola]
+   - improve wording and formatting of the man page  [Benno Schulenberg]
    - make -msglevel 0 to work as is did earlier  [Sami Kerola]
    - mark some options to be exclusive with each other  [Sami Kerola]
    - move show_tabs() and screendump() functions  [Sami Kerola]
@@ -973,7 +1027,9 @@ swaplabel:
    - Improve the typesetting of the manual  [Bjarni Ingi Gislason]
    - wrong version number in check  [Sami Kerola]
 swapon:
+   - align --summary fields  [Sami Kerola]
    - clean up scols usage  [Karel Zak]
+   - mark --sumarry as deprecated  [Karel Zak]
    - swaps with legacy version label are not supported  [Sami Kerola]
    - use libsmartcols  [Ondrej Oprala]
 swapon, swapheader, mkswap:
@@ -1113,6 +1169,7 @@ umount:
    - fix typo in usage  [Jonathan Liu]
    - fix umount by tag for non-roots  [Karel Zak]
    - more robust success message for --all  [Karel Zak]
+   - slightly improve the man page  [Benno Schulenberg]
 unshare:
    - Add possibility to add mapping into root user in user namespace  [Lubomir Rintel]
    - add + to getopt_long()  [Karel Zak]