Hi Or, On Thu, 19 May 2016 16:25:44 +0300 Or Gerlitz <ogerlitz@xxxxxxxxxxxx> wrote: > > Conflict: > > ------------------------------------------------------------ > > diff --cc include/linux/mlx5/driver.h > index 07b504f7eb84,816fe005ca5e..000000000000 > --- a/include/linux/mlx5/driver.h > +++ b/include/linux/mlx5/driver.h > @@@ -41,7 -41,7 +41,11 @@@ > #include <linux/slab.h> > #include <linux/vmalloc.h> > #include <linux/radix-tree.h> > ++<<<<<<< HEAD > +#include <linux/workqueue.h> > ++======= > + #include <linux/interrupt.h> > ++>>>>>>> origin/ib-next-mlx > #include <linux/mlx5/device.h> > #include <linux/mlx5/doorbell.h> I reported this yesterday when it appeared in linux-next. Small conflicts like this are really nothing to worry about and Linus (and I) deal with them all the time. I only report them in case there is some semantic change I missed so that the authors can correct me. P.S. there is something wrong in your mailer (or some part of your process as the patch parts of your email were double spaced and whits space damaged. -- Cheers, Stephen Rothwell -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
