Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1677293

Re: linux-next: manual merge of the tip tree with the pci tree

Show all headers | View raw

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.

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the tip tree with the pci tree Stephen Rothwell <sfr@canb.auug.org.au> - 2017-06-28 05:20 +0200
  Re: linux-next: manual merge of the tip tree with the pci tree Christoph Hellwig <hch@lst.de> - 2017-06-29 02:30 +0200

csiph-web