Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/ntb/hw/mscc/ntb_hw_switchtec.c
between commit:
cfdfc14e7fb8 ("switchtec: Use generic PCI Vendor ID and Class Code")
from the pci tree and commit:
a2a35435484e ("ntb: ntb_hw_switchtec: cleanup 64bit IO
Hi all,
Today's linux-next merge of the akpm-current tree got a conflict in:
drivers/ntb/hw/mscc/ntb_hw_switchtec.c
between commit:
cfdfc14e7fb8 ("switchtec: Use generic PCI Vendor ID and Class Code")
from the pci tree and commit:
a2a35435484e ("ntb: ntb_hw_switchtec: cleanup 64bit IO
On Thu, Sep 25, 2014 at 08:47:44PM +0100, Andrew Morton wrote:
> On Thu, 25 Sep 2014 12:30:00 -0700 Peter Feiner wrote:
>
> > On Thu, Sep 25, 2014 at 05:47:30PM +1000, Stephen Rothwell wrote:
> > > Hi Andrew,
> > >
> > > Today's linux-next merge of the akpm-current tree got a conflict in
> > >
On Thu, Sep 25, 2014 at 08:47:44PM +0100, Andrew Morton wrote:
On Thu, 25 Sep 2014 12:30:00 -0700 Peter Feiner pfei...@google.com wrote:
On Thu, Sep 25, 2014 at 05:47:30PM +1000, Stephen Rothwell wrote:
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
On Thu, 25 Sep 2014 12:30:00 -0700 Peter Feiner wrote:
> On Thu, Sep 25, 2014 at 05:47:30PM +1000, Stephen Rothwell wrote:
> > Hi Andrew,
> >
> > Today's linux-next merge of the akpm-current tree got a conflict in
> > include/asm-generic/pgtable.h between commit b766eafe6828 ("PCI: Add
> >
On Thu, Sep 25, 2014 at 05:47:30PM +1000, Stephen Rothwell wrote:
> Hi Andrew,
>
> Today's linux-next merge of the akpm-current tree got a conflict in
> include/asm-generic/pgtable.h between commit b766eafe6828 ("PCI: Add
> pci_remap_iospace() to map bus I/O resources") from the pci tree and
>
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
include/asm-generic/pgtable.h between commit b766eafe6828 ("PCI: Add
pci_remap_iospace() to map bus I/O resources") from the pci tree and
commit 4cc2f91f2636 ("mm: softdirty: enable write notifications on VMAs
after
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
include/asm-generic/pgtable.h between commit b766eafe6828 (PCI: Add
pci_remap_iospace() to map bus I/O resources) from the pci tree and
commit 4cc2f91f2636 (mm: softdirty: enable write notifications on VMAs
after
On Thu, Sep 25, 2014 at 05:47:30PM +1000, Stephen Rothwell wrote:
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
include/asm-generic/pgtable.h between commit b766eafe6828 (PCI: Add
pci_remap_iospace() to map bus I/O resources) from the pci tree and
commit
On Thu, 25 Sep 2014 12:30:00 -0700 Peter Feiner pfei...@google.com wrote:
On Thu, Sep 25, 2014 at 05:47:30PM +1000, Stephen Rothwell wrote:
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
include/asm-generic/pgtable.h between commit b766eafe6828 (PCI: Add
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
scripts/checkpatch.pl between commit 92e112fdbb3c ("PCI/checkpatch:
Deprecate DEFINE_PCI_DEVICE_TABLE") from the pci tree and commit
369353832de3 ("checkpatch.pl: check for function declarations without
arguments")
Hi Andrew,
Today's linux-next merge of the akpm-current tree got a conflict in
scripts/checkpatch.pl between commit 92e112fdbb3c (PCI/checkpatch:
Deprecate DEFINE_PCI_DEVICE_TABLE) from the pci tree and commit
369353832de3 (checkpatch.pl: check for function declarations without
arguments) from
12 matches
Mail list logo
