* linux-next: manual merge of the char-misc tree with the arm tree
@ 2014-11-24 8:17 Stephen Rothwell
0 siblings, 0 replies; only message in thread
From: Stephen Rothwell @ 2014-11-24 8:17 UTC (permalink / raw)
To: Greg KH, Arnd Bergmann, Russell King, Mathieu Poirier
Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 494 bytes --]
Hi all,
Today's linux-next merge of the char-misc tree got a conflict in
arch/arm/kernel/etm.c between commit 4ed89f222806 ("ARM: convert
printk(KERN_* to pr_*") from the arm tree and commit 184901a06a36
("ARM: removing support for etb/etm in "arch/arm/kernel/"") from the
char-misc tree.
I fixed it up (the latter removed the file, so I did that) and can
carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2014-11-24 8:17 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-11-24 8:17 linux-next: manual merge of the char-misc tree with the arm tree Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).