lkml.org 
[lkml]   [2018]   [Jun]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the staging tree with Linus' tree
On Wed, Jun 06, 2018 at 07:12:05PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got conflicts in:
>
> drivers/staging/ipx/af_ipx.c
> drivers/staging/ipx/ipx_proc.c
>
> between commits:
>
> fddda2b7b521 ("proc: introduce proc_create_seq{,_data}")
> db5051ead64a ("net: convert datagram_poll users tp ->poll_mask")
>
> from Linus' tree and commit:
>
> 7a2e838d28cf ("staging: ipx: delete it from the tree")
>
> from the staging tree.
>
> I fixed it up (I just removed the files) 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.

Thanks, those files should just be removed.

greg k-h

\
 
 \ /
  Last update: 2018-06-06 11:48    [W:0.031 / U:7.740 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site