Hi Rusty,
Today's linux-next merge of the rr tree got a very trivial conflict in
drivers/char/hvc_irq.c between commit
611e097d7707741a336a0677d9d69bec40f29f3d ("hvc_console: rework setup to
replace irq functions with callbacks") from Linus' tree and commit
30b3dcfc04fd3948938e0c7c4a14ca8c50d16839
("misc:hvc_console_rework_setup_to_replace_irq_functions_with_callbacks")
from the rr tree (which is presumbaly the same patch, just whitespace
modified in Linus' tree.
Someone removed the extra blank line at the end of the file ...
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgp8pW9OTSKkK.pgp
Description: PGP signature
