From: Greg KH <greg@kroah.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
Peter Hurley <peter@hurleysoftware.com>,
Shraddha Barke <shraddha.6596@gmail.com>
Subject: Re: linux-next: manual merge of the staging tree with the tty tree
Date: Sun, 31 Jan 2016 20:01:51 -0800 [thread overview]
Message-ID: <20160201040151.GC16865@kroah.com> (raw)
In-Reply-To: <20160201145146.670ad8ce@canb.auug.org.au>
On Mon, Feb 01, 2016 at 02:51:46PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in:
>
> drivers/staging/dgap/dgap.c
>
> between commits:
>
> 6aa56785e735 ("staging: digi: Replace open-coded tty_wakeup()")
> 2d73b069f816 ("staging: dgap: Remove redundant write_wait wakeups")
> 9db276f8f021 ("tty: Use termios c_*flag macros")
>
> from the tty tree and commit:
>
> 7e3933df9874 ("Staging: dgap: Remove obsolete driver")
>
> from the staging tree.
>
> I fixed it up (I just removed the file) and can carry the fix as necessary
> (no action is required).
Thanks for this, that's the obviously correct fix.
greg k-h
next prev parent reply other threads:[~2016-02-01 4:01 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-01 3:51 linux-next: manual merge of the staging tree with the tty tree Stephen Rothwell
2016-02-01 4:01 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2022-10-04 6:33 Stephen Rothwell
2022-10-04 8:26 ` Greg KH
2017-06-05 4:57 Stephen Rothwell
2017-06-05 6:50 ` Greg KH
2012-11-29 4:47 Stephen Rothwell
2012-11-29 5:17 ` Greg KH
2012-11-28 5:14 Stephen Rothwell
2012-11-28 16:47 ` Greg KH
2012-09-17 7:37 Stephen Rothwell
2012-09-17 11:20 ` Greg KH
2012-09-13 6:14 Stephen Rothwell
2012-09-13 6:59 ` Samuel Iglesias Gonsálvez
2012-09-13 7:36 ` Stephen Rothwell
2012-05-07 5:58 Stephen Rothwell
2012-05-07 14:48 ` 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=20160201040151.GC16865@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=peter@hurleysoftware.com \
--cc=sfr@canb.auug.org.au \
--cc=shraddha.6596@gmail.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.