Messages in this thread | | | Date | Thu, 29 Jun 2017 02:14:39 +0200 | From | Christoph Hellwig <> | Subject | Re: linux-next: manual merge of the tip tree with the pci tree |
| |
On Wed, Jun 28, 2017 at 01:15:34PM +1000, Stephen Rothwell 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.
The merge looks fine to me.
| |