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

From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
	"H. Peter Anvin" <hpa@zytor•com>,
	Peter Zijlstra <peterz@infradead•org>,
	Mark Brown <broonie@kernel•org>
Cc: Linux Next Mailing List <linux-next@vger•kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
	Marek Szyprowski <m.szyprowski@samsung•com>
Subject: linux-next: manual merge of the tip tree with the spi tree
Date: Fri, 10 Jul 2020 14:43:49 +1000	[thread overview]
Message-ID: <20200710144349.516fdeca@canb.auug.org.au> (raw)

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

Hi all,

Today's linux-next merge of the tip tree got a conflict in:

  drivers/spi/spi.c

between commit:

  60a883d119ab ("spi: use kthread_create_worker() helper")

from the spi tree and commit:

  3070da33400c ("sched,spi: Convert to sched_set_fifo*()")

from the tip 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/spi/spi.c
index 1d7bba434225,5a4f0bfce474..000000000000
--- a/drivers/spi/spi.c
+++ b/drivers/spi/spi.c
@@@ -1614,11 -1592,9 +1614,9 @@@ EXPORT_SYMBOL_GPL(spi_take_timestamp_po
   */
  static void spi_set_thread_rt(struct spi_controller *ctlr)
  {
- 	struct sched_param param = { .sched_priority = MAX_RT_PRIO / 2 };
- 
  	dev_info(&ctlr->dev,
  		"will run message pump with realtime priority\n");
- 	sched_setscheduler(ctlr->kworker->task, SCHED_FIFO, &param);
 -	sched_set_fifo(ctlr->kworker_task);
++	sched_set_fifo(ctlr->kworker->task);
  }
  
  static int spi_init_queue(struct spi_controller *ctlr)

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

next             reply	other threads:[~2020-07-10  4:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-10  4:43 Stephen Rothwell [this message]
  -- strict thread matches above, loose matches on Subject: below --
2017-08-28  4:05 linux-next: manual merge of the tip tree with the spi tree Stephen Rothwell
2017-09-04  6:07 ` 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=20200710144349.516fdeca@canb.auug.org.au \
    --to=sfr@canb$(echo .)auug.org.au \
    --cc=broonie@kernel$(echo .)org \
    --cc=hpa@zytor$(echo .)com \
    --cc=linux-kernel@vger$(echo .)kernel.org \
    --cc=linux-next@vger$(echo .)kernel.org \
    --cc=m.szyprowski@samsung$(echo .)com \
    --cc=mingo@elte$(echo .)hu \
    --cc=peterz@infradead$(echo .)org \
    --cc=tglx@linutronix$(echo .)de \
    /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