Skip to content

Draft: Merge tag 'kernel-5.14.0-284.8.1.el9_2' from 9.2

Bring in changes from 9.2 tag kernel-5.14.0-284.8.1.el9_2.

The change to Makefile.rhelver was dropped since it is not applicable to centos stream 9.

The changes to redhat/kabi/kabi-module and redhat/kernel.spec.template were dropped since they are specific changes proposed for 9.2, not relevant to CentOS/9.3.

There was a reported conflict with .gitlab-ci.yml, in which I just ignored any change and just kept the CentOS/9.3 version in place, so no changes are done to it with this merge.

Lastly, there was a tricky conflict involving the file fs/xfs/xfs_aops.c:

The problem with this one, is that in CentOS we just had a recent mm backport applied which introduced folios, and that area of code was very much impacted. On top of that, some xfs changes to that area were applied out of order with the folio backport.

Because mm changes with folios are now present, to fix the conflict the same changes as in upstream commit 8ac5b996bf51 ("xfs: fix off-by-one-block in xfs_discard_folio()") needs to be applied, instead of using the 9.2 version. However, looking closely I also found that the CentOS backport done in commit 50c8a420 ("iomap,xfs: Convert ->discard_page to ->discard_folio") did a wrong conflict resolution, because it didn't take into account that xfs already backported the upstream commit 7348b322332d ("xfs: xfs_bmap_punch_delalloc_range() should take a byte range"), and re-added some code like the start_fsb/pageoff_fsb variables, essentially reverting the changes in xfs_discard_folio that were done by the backport 48ccb79c ("xfs: xfs_bmap_punch_delalloc_range() should take a byte range").

All these problems with the xfs code will be handled through bug 2167832, so I dropped the xfs changes in this merge as well, as the proper backport and fixes will be done through that bug.

Signed-off-by: Herton R. Krzesinski herton@redhat.com

Edited by Herton R. Krzesinski

Merge request reports