* linux-next: manual merge of the block tree with the mm-stable tree
@ 2024-11-11 2:52 Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2024-11-11 2:52 UTC (permalink / raw)
To: Jens Axboe, Andrew Morton
Cc: Linux Kernel Mailing List, Linux Next Mailing List, Liu Shixin,
Sergey Senozhatsky
[-- Attachment #1: Type: text/plain, Size: 1364 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
drivers/block/zram/zram_drv.c
between commit:
58652f2b6d21 ("zram: permit only one post-processing operation at a time")
from the mm-stable tree and commit:
5fcfcd51ea1c ("zram: fix NULL pointer in comp_algorithm_show()")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
--
Cheers,
Stephen Rothwell
diff --cc drivers/block/zram/zram_drv.c
index cee49bb0126d,5223a03cb10e..000000000000
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@@ -2571,7 -2381,8 +2571,9 @@@ static int zram_add(void
zram->disk->fops = &zram_devops;
zram->disk->private_data = zram;
snprintf(zram->disk->disk_name, 16, "zram%d", device_id);
+ atomic_set(&zram->pp_in_progress, 0);
+ zram_comp_params_reset(zram);
+ comp_algorithm_set(zram, ZRAM_PRIMARY_COMP, default_compressor);
/* Actual capacity set using sysfs (/sys/block/zram<id>/disksize */
set_capacity(zram->disk, 0);
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the block tree with the mm-stable tree
@ 2026-06-01 16:58 Mark Brown
2026-06-01 17:44 ` Matthew Wilcox
0 siblings, 1 reply; 3+ messages in thread
From: Mark Brown @ 2026-06-01 16:58 UTC (permalink / raw)
To: Jens Axboe
Cc: Andrew Morton, David Carlier, Linux Kernel Mailing List,
Linux Next Mailing List, Matthew Wilcox
[-- Attachment #1: Type: text/plain, Size: 1687 bytes --]
Hi all,
Today's linux-next merge of the block tree got a conflict in:
mm/page_io.c
between commit:
d590df11be0f1 ("mm/page_io: rename swap_iocb fields for clarity")
from the mm-stable tree and commit:
ca36c1aaee095 ("block: Add bvec_folio()")
from the block tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc mm/page_io.c
index f2d8fe7fd0574,a59b73f8bdd9d..0000000000000
--- a/mm/page_io.c
+++ b/mm/page_io.c
@@@ -499,8 -489,8 +499,8 @@@ static void sio_read_complete(struct ki
int p;
if (ret == sio->len) {
- for (p = 0; p < sio->pages; p++) {
- struct folio *folio = bvec_folio(&sio->bvec[p]);
+ for (p = 0; p < sio->nr_bvecs; p++) {
- struct folio *folio = page_folio(sio->bvecs[p].bv_page);
++ struct folio *folio = bvec_folio(&sio->bvecs[p]);
count_mthp_stat(folio_order(folio), MTHP_STAT_SWPIN);
count_memcg_folio_events(folio, PSWPIN, folio_nr_pages(folio));
@@@ -509,8 -499,8 +509,8 @@@
}
count_vm_events(PSWPIN, sio->len >> PAGE_SHIFT);
} else {
- for (p = 0; p < sio->pages; p++) {
- struct folio *folio = bvec_folio(&sio->bvec[p]);
+ for (p = 0; p < sio->nr_bvecs; p++) {
- struct folio *folio = page_folio(sio->bvecs[p].bv_page);
++ struct folio *folio = bvec_folio(&sio->bvecs[p]);
folio_unlock(folio);
}
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the block tree with the mm-stable tree
2026-06-01 16:58 Mark Brown
@ 2026-06-01 17:44 ` Matthew Wilcox
0 siblings, 0 replies; 3+ messages in thread
From: Matthew Wilcox @ 2026-06-01 17:44 UTC (permalink / raw)
To: Mark Brown
Cc: Jens Axboe, Andrew Morton, David Carlier,
Linux Kernel Mailing List, Linux Next Mailing List
On Mon, Jun 01, 2026 at 05:58:58PM +0100, Mark Brown wrote:
> Hi all,
>
> Today's linux-next merge of the block tree got a conflict in:
>
> mm/page_io.c
>
> between commit:
>
> d590df11be0f1 ("mm/page_io: rename swap_iocb fields for clarity")
>
> from the mm-stable tree and commit:
>
> ca36c1aaee095 ("block: Add bvec_folio()")
>
> from the block tree.
Thanks; your resolution is clearly correct. If it'd be easier, we can
just drop the hunk touching mm/page_io.c from the block tree and I can
submit a separate patch next merge window to the mm tree. But the
resolution seems straightforward enough that maybe just keep it.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-06-01 17:44 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-11 2:52 linux-next: manual merge of the block tree with the mm-stable tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2026-06-01 16:58 Mark Brown
2026-06-01 17:44 ` Matthew Wilcox
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox