From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Joe Perches <joe@perches.com>, David Miller <davem@davemloft.net>,
netdev@vger.kernel.org, Jiri Slaby <jslaby@suse.cz>
Subject: linux-next: manual merge of the tty tree with the net-next tree
Date: Fri, 9 Mar 2012 17:02:01 +1100 [thread overview]
Message-ID: <20120309170201.93eec7e1108165c02ba2311c@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 1015 bytes --]
Hi Greg,
Today's linux-next merge of the tty tree got a conflict in
drivers/isdn/gigaset/interface.c between commit 5bd49735db39 ("gigaset:
Use semicolons to terminate statements") from the net-next tree and
commit 2f16669d322e ("TTY: remove re-assignments to tty_driver members")
from the tty tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc drivers/isdn/gigaset/interface.c
index b826dac,8f8814a..0000000
--- a/drivers/isdn/gigaset/interface.c
+++ b/drivers/isdn/gigaset/interface.c
@@@ -679,9 -593,8 +593,8 @@@ void gigaset_if_initdriver(struct gigas
if (tty == NULL)
goto enomem;
- tty->magic = TTY_DRIVER_MAGIC;
- tty->type = TTY_DRIVER_TYPE_SERIAL,
- tty->subtype = SERIAL_TYPE_NORMAL,
+ tty->type = TTY_DRIVER_TYPE_SERIAL;
+ tty->subtype = SERIAL_TYPE_NORMAL;
tty->flags = TTY_DRIVER_REAL_RAW | TTY_DRIVER_DYNAMIC_DEV;
tty->driver_name = procname;
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
next reply other threads:[~2012-03-09 6:02 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-09 6:02 Stephen Rothwell [this message]
2021-04-06 8:48 linux-next: manual merge of the tty tree with the net-next tree Stephen Rothwell
2021-04-06 9:11 ` Greg KH
2023-08-09 3:37 Stephen Rothwell
2023-08-09 7:54 ` Greg KH
2023-08-09 3:40 Stephen Rothwell
2023-08-09 7:54 ` Greg KH
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=20120309170201.93eec7e1108165c02ba2311c@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=davem@davemloft.net \
--cc=greg@kroah.com \
--cc=joe@perches.com \
--cc=jslaby@suse.cz \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).