[MERGE] resolve conflicts and merge 5.25.1 release with blead

diff --cc pod/perldelta.pod
index 3e6a8c7,3698326..eee8529
--- 1/pod/perldelta.pod
--- 2/pod/perldelta.pod
+++ b/pod/perldelta.pod
@@@ -157,19 -135,22 +135,25 @@@ L<Module::Metadata> has been upgraded f
  
  =item *
  
- L<POSIX> has been upgraded from version 1.66 to 1.69. This remedies several
+ L<perlfaq> has been upgraded from version 5.021010 to 5.021011.
+ 
+ =item *
+ 
+ L<POSIX> has been upgraded from version 1.65 to 1.69. This remedies several
 -defects in making its symbols exportable. [perl #127821]  Furthermore,
 -the C<POSIX::tmpnam()> interface has been removed,
 +defects in making its symbols exportable. [perl #127821]
 +The C<POSIX::tmpnam()> interface has been removed,
  see L</"POSIX::tmpnam() has been removed">.
 +Trying to import POSIX subs that have no real implementations
 +(like C<POSIX::atend()>) now fails at import time, instead of
 +waiting until runtime.
  
- =back
+ =item *
  
- =head2 Removed Modules and Pragmata
+ L<re> has been upgraded from version 0.32 to 0.33.
  
- =over 4
+ =item *
+ 
+ L<Scalar::Util> has been upgraded from version 1.42_02 to 1.45_01.
  
  =item *