From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Behan Webster <behanw@converseincode•com>,
llvmlinux@lists•linuxfoundation.org,
Wim Van Sebroeck <wim@iguana•be>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Mark Charlebois <charlebm@gmail•com>,
Rob Clark <robdclark@gmail•com>
Subject: linux-next: manual merge of the llvmlinux tree with the tree
Date: Mon, 15 Sep 2014 16:38:13 +1000 [thread overview]
Message-ID: <20140915163813.490886b4@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2014-09-15 6:38 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-15 6:38 Stephen Rothwell [this message]
2014-09-15 14:24 ` linux-next: manual merge of the llvmlinux tree with the tree Behan Webster
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140915163813.490886b4@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=behanw@converseincode$(echo .)com \
--cc=charlebm@gmail$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=llvmlinux@lists$(echo .)linuxfoundation.org \
--cc=robdclark@gmail$(echo .)com \
--cc=wim@iguana$(echo .)be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox