linux-next: manual merge of the tip tree with the spi tree

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 b

Re: linux-next: manual merge of the tip tree with the spi tree

Hi all, On Mon, 28 Aug 2017 14:05:03 +1000 Stephen Rothwell wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > tools/Makefile > > between commit: > > e9d4650dcc59 ("spi: tools: add install section") > > from the spi tree and commit: > > ecda85e70277 ("x86/lgues

linux-next: manual merge of the tip tree with the spi tree

Hi all, Today's linux-next merge of the tip tree got a conflict in: tools/Makefile between commit: e9d4650dcc59 ("spi: tools: add install section") from the spi tree and commit: ecda85e70277 ("x86/lguest: Remove lguest support") from the tip tree. I fixed it up (see below) and can car