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

Groups > linux.kernel > #1206923

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

Show all headers | View raw

On Thu, Aug 13, 2015 at 02:55:35PM +1000, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/ozwpan/ozproto.c
> 
> between commit:
> 
>   5a447f09a8df ("staging: ozwpan: Fix hrtimer wreckage")
> 
> from the tip tree and commit:
> 
>   a73e99cb67e7 ("staging: ozwpan: Remove from tree")
> 
> from the staging tree.
> 
> I fixed it up (I just removed the file) and can carry the fix as necessary
> (no action is required).

Sounds good to me, thanks.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

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

Thread

linux-next: manual merge of the staging tree with the tip tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-13 07:00 +0200
  Re: linux-next: manual merge of the staging tree with the tip tree Greg KH <greg@kroah.com> - 2015-08-13 17:40 +0200

csiph-web