Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1322812
| Path | csiph.com!aioe.org!bofh.it!news.nic.it!robomod |
|---|---|
| From | Stephen Rothwell <sfr@canb.auug.org.au> |
| Newsgroups | linux.kernel |
| Subject | linux-next: manual merge of the staging tree with the tty tree |
| Date | Mon, 01 Feb 2016 05:00:02 +0100 |
| Message-ID | <qXdOF-55d-3@gated-at.bofh.it> (permalink) |
| Dkim-Signature | v=1; a=rsa-sha256; c=relaxed/simple; d=canb.auug.org.au; s=201601; t=1454298707; bh=EMAQi2t91Fpc6XoM+Wpo57ww8XwayCvXSRYTUoRkoCA=; h=Date:From:To:Cc:Subject:From; b=R/nYXhOCP0KZUG9Tj6Sh0ZDqWld5y4ekgfxGOVYWdhZvCN0FGexTBusg1nXX3WzJn ky43SvdEBmsSYdW0Z4gjubNABkYISJpJqTvXNxlt+9V2DWZQAiAwCJSqXY2pC/ZnRP F3+2Q9Wa4LqCKkGt9OPYC1lYLdIMuSDbTDTx3sKA= |
| X-Mailer | Claws Mail 3.13.2 (GTK+ 2.24.29; x86_64-pc-linux-gnu) |
| MIME-Version | 1.0 |
| Content-Type | text/plain; charset=US-ASCII |
| Content-Transfer-Encoding | 7bit |
| Sender | robomod@news.nic.it |
| List-ID | <linux-kernel.vger.kernel.org> |
| X-Mailing-List | linux-kernel@vger.kernel.org |
| Approved | robomod@news.nic.it |
| Lines | 24 |
| Organization | linux.* mail to news gateway |
| X-Original-Cc | linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Peter Hurley <peter@hurleysoftware.com>, Shraddha Barke <shraddha.6596@gmail.com> |
| X-Original-Date | Mon, 1 Feb 2016 14:51:46 +1100 |
| X-Original-Message-ID | <20160201145146.670ad8ce@canb.auug.org.au> |
| X-Original-Sender | linux-kernel-owner@vger.kernel.org |
| Xref | csiph.com linux.kernel:1322812 |
Show key headers only | View raw
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).
--
Cheers,
Stephen Rothwell
Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread
linux-next: manual merge of the staging tree with the tty tree Stephen Rothwell <sfr@canb.auug.org.au> - 2016-02-01 05:00 +0100 Re: linux-next: manual merge of the staging tree with the tty tree Greg KH <greg@kroah.com> - 2016-02-01 05:10 +0100
csiph-web