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

From	Greg KH <greg@kroah.com>
Newsgroups	linux.kernel
Subject	Re: linux-next: manual merge of the staging tree with the staging.current tree
Date	2016-02-01 05:10 +0100
Message-ID	<qXdYl-5sq-1@gated-at.bofh.it> (permalink)
References	<qXdF0-51B-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

On Mon, Feb 01, 2016 at 02:45:21PM +1100, Stephen Rothwell wrote:
> Hi Greg,
> 
> Today's linux-next merge of the staging tree got a conflict in:
> 
>   drivers/staging/panel/panel.c
> 
> between commit:
> 
>   b64a1cbef6df ("Revert "Staging: panel: usleep_range is preferred over udelay"")
> 
> from the staging.current tree and commit:
> 
>   df44f1504b4d ("staging: panel: remove warnings line over 80 characters")
> 
> from the staging tree.
> 
> I fixed it up (I used the staging.current version) and can carry the fix as necessary (no action
> is required).

Thanks, I'll resolve it as well when I merge 4.5-rc2 into this branch.

thanks,

greg k-h

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

Thread

linux-next: manual merge of the staging tree with the  staging.current tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-01 04:50 +0100
  Re: linux-next: manual merge of the staging tree with the  staging.current tree Greg KH <greg@kroah.com> - 2016-02-01 05:10 +0100

csiph-web