From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: linux-next@vger.kernel.org, David Miller <davem@davemloft.net>,
Alan Cox <alan@redhat.com>
Subject: linux-next: manual merge of the timers tree
Date: Tue, 14 Oct 2008 16:59:24 +1100 [thread overview]
Message-ID: <20081014165924.4e71241b.sfr@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1055 bytes --]
Hi all,
Today's linux-next merge of the timers tree got a conflict in
drivers/serial/8250.c between commit
b70ac7718579b5cbf3bdd74fd01132d1c91596f4 ("serial: allow 8250 to be used
on sparc") from Linus' tree and commit
d1c115207ad93ecf1140c38c3cef249352433c28 ("serial, 8250: remove NR_IRQ
usage") from the timers tree.
Just overlapping changes. I fixed it up (see below).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc drivers/serial/8250.c
index ec39203,356c2a2..0000000
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@@ -3003,15 -3027,11 +3049,15 @@@ static int __init serial8250_init(void
goto out;
platform_device_del(serial8250_isa_devs);
- put_dev:
+ put_dev:
platform_device_put(serial8250_isa_devs);
- unreg_uart_drv:
+ unreg_uart_drv:
+#ifdef CONFIG_SPARC
+ sunserial_unregister_minors(&serial8250_reg, UART_NR);
+#else
uart_unregister_driver(&serial8250_reg);
+#endif
- out:
+ out:
return ret;
}
[-- Attachment #2: Type: application/pgp-signature, Size: 197 bytes --]
next reply other threads:[~2008-10-14 7:05 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-14 5:59 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-12-29 2:02 linux-next: manual merge of the timers tree Stephen Rothwell
2008-10-21 1:43 Stephen Rothwell
2008-10-21 12:15 ` Ingo Molnar
2008-10-21 12:18 ` Stephen Rothwell
2008-10-14 6:12 Stephen Rothwell
2008-10-14 6:03 Stephen Rothwell
2008-10-14 5:51 Stephen Rothwell
2008-09-12 7:10 Stephen Rothwell
2008-09-12 6:57 Stephen Rothwell
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=20081014165924.4e71241b.sfr@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=alan@redhat.com \
--cc=davem@davemloft.net \
--cc=hpa@zytor.com \
--cc=linux-next@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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