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

From	Stephen Rothwell <sfr@canb.auug.org.au>
Newsgroups	linux.kernel
Subject	linux-next: manual merge of the staging tree with the staging.current tree
Date	2016-02-01 04:50 +0100
Message-ID	<qXdF0-51B-3@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

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).

-- 
Cheers,
Stephen Rothwell

Back to linux.kernel | Previous | Next — Next 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