* linux-next: manual merge of the llvmlinux tree with the tree
@ 2014-09-15 6:38 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2014-09-15 6:38 UTC (permalink / raw)
To: Behan Webster, llvmlinux, Wim Van Sebroeck
Cc: linux-next, linux-kernel, Mark Charlebois, Rob Clark
[-- Attachment #1: Type: text/plain, Size: 684 bytes --]
Hi all,
Today's linux-next merge of the llvmlinux tree got a conflict in
drivers/gpu/drm/msm/hdmi/hdmi.c between commit fc886107c556 ("drm/msm:
Change nested function to static function") from the watchdog tree and
commit 8f2c494adad0 ("msm, hdmi: LLVMLinux: Remove nested function from
HDMI driver") from the llvmlinux tree.
I fixed it up (these patches are doing the same thing, so I used the
version in the watchdog tree) and can carry the fix as necessary (no
action is required).
P.S. Behan, I noticed that the llvmlinux patch has no Signed-off-by
from you even though you committed it ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* linux-next: manual merge of the llvmlinux tree with the tree
@ 2014-09-15 6:38 ` Stephen Rothwell
0 siblings, 0 replies; 3+ messages in thread
From: Stephen Rothwell @ 2014-09-15 6:38 UTC (permalink / raw)
To: Behan Webster, llvmlinux, Wim Van Sebroeck
Cc: linux-next, linux-kernel, Mark Charlebois, Rob Clark
[-- Attachment #1: Type: text/plain, Size: 684 bytes --]
Hi all,
Today's linux-next merge of the llvmlinux tree got a conflict in
drivers/gpu/drm/msm/hdmi/hdmi.c between commit fc886107c556 ("drm/msm:
Change nested function to static function") from the watchdog tree and
commit 8f2c494adad0 ("msm, hdmi: LLVMLinux: Remove nested function from
HDMI driver") from the llvmlinux tree.
I fixed it up (these patches are doing the same thing, so I used the
version in the watchdog tree) and can carry the fix as necessary (no
action is required).
P.S. Behan, I noticed that the llvmlinux patch has no Signed-off-by
from you even though you committed it ...
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: linux-next: manual merge of the llvmlinux tree with the tree
2014-09-15 6:38 ` Stephen Rothwell
(?)
@ 2014-09-15 14:24 ` Behan Webster
-1 siblings, 0 replies; 3+ messages in thread
From: Behan Webster @ 2014-09-15 14:24 UTC (permalink / raw)
To: Stephen Rothwell, llvmlinux, Wim Van Sebroeck
Cc: linux-next, linux-kernel, Mark Charlebois, Rob Clark
On 09/14/14 23:38, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the llvmlinux tree got a conflict in
> drivers/gpu/drm/msm/hdmi/hdmi.c between commit fc886107c556 ("drm/msm:
> Change nested function to static function") from the watchdog tree and
> commit 8f2c494adad0 ("msm, hdmi: LLVMLinux: Remove nested function from
> HDMI driver") from the llvmlinux tree.
>
> I fixed it up (these patches are doing the same thing, so I used the
> version in the watchdog tree) and can carry the fix as necessary (no
> action is required).
>
> P.S. Behan, I noticed that the llvmlinux patch has no Signed-off-by
> from you even though you committed it ...
Drat. That patch wasn't supposed to be in there. Sorry about that.
Yeah. That one was accepted upstream already. I was carrying it in my
repos so we could still build until it made it to mainline. I should not
have put that in linux-next. I actually just had to pull it out of my
own builds due to the same merge issue.
Hmm. Seems I put a couple of patches into the for-next branch late last
night which shouldn't have been. Fixed.
Apologies,
Behan
--
Behan Webster
behanw@converseincode.com
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-09-15 14:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-09-15 6:38 linux-next: manual merge of the llvmlinux tree with the tree Stephen Rothwell
2014-09-15 6:38 ` Stephen Rothwell
2014-09-15 14:24 ` Behan Webster
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.