public inbox for linux-next@vger.kernel.org 
 help / color / mirror / Atom feed

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Andrew Morton <akpm@linux-foundation•org>
Cc: Kent Overstreet <kent.overstreet@linux•dev>,
	Kuan-Wei Chiu <visitorckw@gmail•com>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Linux Next Mailing List <linux-next@vger•kernel.org>
Subject: linux-next: manual merge of the mm-nonmm-stable tree with Linus' tree
Date: Thu, 11 Jul 2024 08:48:05 +1000	[thread overview]
Message-ID: <20240711084805.369c466d@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1611 bytes --]

Hi all,

Today's linux-next merge of the mm-nonmm-stable tree got a conflict in:

  fs/bcachefs/clock.c

between commit:

  a2d23f3d916b ("bcachefs: io clock: run timer fns under clock lock")

from Linus' tree and commit:

  1fcce6b8a768 ("bcachefs: remove heap-related macros and switch to generic min_heap")

from the mm-nonmm-stable tree.

I fixed it up (I think - 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 fs/bcachefs/clock.c
index 0f40b585ce2b,18fab9c44b1b..000000000000
--- a/fs/bcachefs/clock.c
+++ b/fs/bcachefs/clock.c
@@@ -131,10 -148,21 +148,17 @@@ static struct io_timer *get_expired_tim
  					  unsigned long now)
  {
  	struct io_timer *ret = NULL;
+ 	const struct min_heap_callbacks callbacks = {
+ 		.less = io_timer_cmp,
+ 		.swp = io_timer_swp,
+ 	};
+ 
 -	spin_lock(&clock->timer_lock);
 -
+ 	if (clock->timers.nr &&
+ 	    time_after_eq(now, clock->timers.data[0]->expire)) {
+ 		ret = *min_heap_peek(&clock->timers);
+ 		min_heap_pop(&clock->timers, &callbacks, NULL);
+ 	}
  
- 	if (clock->timers.used &&
- 	    time_after_eq(now, clock->timers.data[0]->expire))
- 		heap_pop(&clock->timers, ret, io_timer_cmp, NULL);
 -	spin_unlock(&clock->timer_lock);
 -
  	return ret;
  }
  

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

next             reply	other threads:[~2024-07-10 22:48 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-07-10 22:48 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-03-14 22:46 linux-next: manual merge of the mm-nonmm-stable tree with Linus' tree Stephen Rothwell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240711084805.369c466d@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=akpm@linux-foundation$(echo .)org \
    --cc=kent.overstreet@linux$(echo .)dev \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=visitorckw@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox