;h...@zytor.com>; Peter Zijlstra
> <pet...@infradead.org>; linux-n...@vger.kernel.org; linux-
> ker...@vger.kernel.org; J. German Rivera <german.riv...@freescale.com>;
> Qais Yousef <qais.you...@imgtec.com>
> Subject: Re: linux-next: manual merge of the staging tree with the
. German Rivera ;
> Qais Yousef
> Subject: Re: linux-next: manual merge of the staging tree with the tip tree
>
> On Wed, Mar 02, 2016 at 08:54:39AM +0100, Thomas Gleixner wrote:
> > On Wed, 2 Mar 2016, Stephen Rothwell wrote:
> > > Hi Greg,
> > >
>
On Wed, Mar 02, 2016 at 08:54:39AM +0100, Thomas Gleixner wrote:
> On Wed, 2 Mar 2016, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the staging tree got a conflict in:
> >
> > include/linux/irqdomain.h
> >
> > between commit:
> >
> > 29d5c8db26ad ("genirq: Add
On Wed, Mar 02, 2016 at 08:54:39AM +0100, Thomas Gleixner wrote:
> On Wed, 2 Mar 2016, Stephen Rothwell wrote:
> > Hi Greg,
> >
> > Today's linux-next merge of the staging tree got a conflict in:
> >
> > include/linux/irqdomain.h
> >
> > between commit:
> >
> > 29d5c8db26ad ("genirq: Add
On Wed, 2 Mar 2016, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> include/linux/irqdomain.h
>
> between commit:
>
> 29d5c8db26ad ("genirq: Add DOMAIN_BUS_IPI")
>
> from the tip tree and commit:
>
> 9b1b282ccd81 ("irqdomain:
On Wed, 2 Mar 2016, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> include/linux/irqdomain.h
>
> between commit:
>
> 29d5c8db26ad ("genirq: Add DOMAIN_BUS_IPI")
>
> from the tip tree and commit:
>
> 9b1b282ccd81 ("irqdomain:
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
include/linux/irqdomain.h
between commit:
29d5c8db26ad ("genirq: Add DOMAIN_BUS_IPI")
from the tip tree and commit:
9b1b282ccd81 ("irqdomain: Added domain bus token DOMAIN_BUS_FSL_MC_MSI")
from the staging tree.
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
include/linux/irqdomain.h
between commit:
29d5c8db26ad ("genirq: Add DOMAIN_BUS_IPI")
from the tip tree and commit:
9b1b282ccd81 ("irqdomain: Added domain bus token DOMAIN_BUS_FSL_MC_MSI")
from the staging tree.
On Thu, Aug 13, 2015 at 02:55:35PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/ozwpan/ozproto.c
>
> between commit:
>
> 5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")
>
> from the tip tree and
On Thu, Aug 13, 2015 at 02:55:35PM +1000, Stephen Rothwell wrote:
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/ozwpan/ozproto.c
between commit:
5a447f09a8df (staging: ozwpan: Fix hrtimer wreckage)
from the tip tree and commit:
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/ozwpan/ozproto.c
between commit:
5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")
from the tip tree and commit:
a73e99cb67e7 ("staging: ozwpan: Remove from tree")
from the staging tree.
I
Hi Greg,
Today's linux-next merge of the staging tree got a conflict in:
drivers/staging/ozwpan/ozproto.c
between commit:
5a447f09a8df (staging: ozwpan: Fix hrtimer wreckage)
from the tip tree and commit:
a73e99cb67e7 (staging: ozwpan: Remove from tree)
from the staging tree.
I fixed
12 matches
Mail list logo
