Re: linux-next: manual merge of the net-next tree with the net tree

From: Stephen Rothwell
Date: Mon Aug 07 2017 - 01:00:09 EST

Hi Neal,

On Sun, 6 Aug 2017 22:21:43 -0400 Neal Cardwell <ncardwell@xxxxxxxxxx> wrote:
> > I fixed it up (see below) and can carry the fix as necessary. This
> > is now fixed as far as linux-next is concerned, but any non trivial
> > conflicts should be mentioned to your upstream maintainer when your tree
> > is submitted for merging. You may also want to consider cooperating
> > with the maintainer of the conflicting tree to minimise any particularly
> > complex conflicts.
> Sorry about that. Will try to follow that procedure in the future.

The above is a generic statement I add to all these emails. It is
aimed more at the maintainers if the trees involved, no the developers
of patches. I don't think you need to do anything different in these
cases with the "net" and "net-next" tree. Dave Miller will fix up any
conflicts when he next merges the net tree into the net-next tree.

Stephen Rothwell