On Tue, 4 Jul 2017, Thomas Gleixner wrote:
> On Mon, 3 Jul 2017, Linus Torvalds wrote:
>
> > On Mon, Jul 3, 2017 at 12:42 AM, Thomas Gleixner <[email protected]> wrote:
> > >
> > > please pull the latest irq-core-for-linus git tree from:
> > >
> > > git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
> > > irq-core-for-linus
> >
> > Ugh, this caused conflicts with the block tree, with commits
> >
> > - fe631457ff3e: "blk-mq: map all HWQ also in hyperthreaded system"
> >
> > - 5f042e7cbd9e "blk-mq: Include all present CPUs in the default queue
> > mapping"
> >
> > clashing.
> >
> > I'm not at all understanding why that second commit came in through
> > the irq tree at all, in fact. Very annoying. Why was that not sent
> > through the block tree? It doesn't seem to have anything fundamentally
> > to do with irqs, really: it's a driver CPU choice for irq chocie.
>
> There is a dependency. The changes in the block code rely on the new
> features of the generic interrupt affinity management. See below.
That said, we should have kept the colliding changes back, wait until
block and irq got merged and then apply them again properly.
Sorry for the inconveniance.
Thanks,
tglx
