From: Dan Williams <dan.j.williams@intel.com>
To: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
David Daney <ddaney@caviumnetworks.com>
Subject: Re: linux-next: manual merge of the ttydev tree
Date: Thu, 11 Dec 2008 07:46:36 -0700 [thread overview]
Message-ID: <494127CC.6060800@intel.com> (raw)
In-Reply-To: <20081211102122.5fe69850@lxorguk.ukuu.org.uk>
Alan Cox wrote:
> On Thu, 11 Dec 2008 17:26:45 +1100
> Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
>> Hi Alan,
>>
>> Today's linux-next merge of the ttydev tree got a conflict in
>> drivers/serial/8250.c between commit
>> 507ce132910803e8fd1116467e99f59da3d526f0 ("iop13xx: workaround errata
>> that causes uart interrupts to be missed") from the async_tx tree and
>> commit 63c4074301f79f1620d6c880973d6ef1cc770990
>> ("tty-serial-8250-regops") from the ttydev tree.
>>
>> I have reverted the async_tx commit for today. Please try to figure out
>> what should happen here.
>
> Dan - can you feed the uart 8250 patches through the ttydev tree or are
> there dependancies on other parts of async_tx ?
>
No, this purely my fault. That is a debugging patch I use when testing
my tree on iop13xx and I inadvertantly included it in my latest push to
-next. It has been removed. Sorry for the noise.
Regards,
Dan
next prev parent reply other threads:[~2008-12-11 14:46 UTC|newest]
Thread overview: 72+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-11 6:26 linux-next: manual merge of the ttydev tree Stephen Rothwell
2008-12-11 10:21 ` Alan Cox
2008-12-11 14:46 ` Dan Williams [this message]
-- strict thread matches above, loose matches on Subject: below --
2008-09-19 2:57 Stephen Rothwell
2008-09-19 2:53 Stephen Rothwell
2008-08-25 8:33 Stephen Rothwell
2008-08-25 8:24 Stephen Rothwell
2008-08-22 5:51 Stephen Rothwell
2008-08-21 8:03 Stephen Rothwell
2008-08-21 10:21 ` Alan Cox
2008-08-21 12:14 ` Stephen Rothwell
2008-08-19 7:43 Stephen Rothwell
2008-08-19 19:57 ` Greg KH
2008-08-18 6:08 Stephen Rothwell
2008-08-14 5:50 Stephen Rothwell
2008-08-12 6:58 Stephen Rothwell
2008-08-12 20:42 ` Greg KH
2008-08-12 6:55 Stephen Rothwell
2008-07-23 6:47 Stephen Rothwell
2008-07-22 6:37 Stephen Rothwell
2008-07-22 10:31 ` Alan Cox
2008-07-21 7:20 Stephen Rothwell
2008-07-18 8:48 Stephen Rothwell
2008-07-18 8:41 Stephen Rothwell
2008-07-18 8:28 Stephen Rothwell
2008-07-18 8:23 Stephen Rothwell
2008-07-18 8:20 Stephen Rothwell
2008-07-18 8:49 ` Alan Cox
2008-07-18 10:49 ` Adrian Bunk
2008-07-18 10:55 ` David Miller
2008-07-18 11:00 ` Adrian Bunk
2008-07-04 9:11 Stephen Rothwell
2008-07-04 15:41 ` Alan Cox
2008-07-01 14:12 Stephen Rothwell
2008-07-01 14:16 ` Alan Cox
2008-07-01 14:09 Stephen Rothwell
2008-07-01 14:14 ` Alan Cox
2008-07-01 14:07 Stephen Rothwell
2008-07-01 14:12 ` Alan Cox
2008-07-01 14:43 ` Adrian Bunk
2008-07-01 15:42 ` Alan Cox
2008-07-01 16:45 ` Adrian Bunk
2008-07-01 14:04 Stephen Rothwell
2008-07-01 13:56 Stephen Rothwell
2008-07-01 13:54 Stephen Rothwell
2008-07-01 13:43 Stephen Rothwell
2008-07-01 12:43 Stephen Rothwell
2008-07-01 14:09 ` Alan Cox
2008-07-01 15:07 ` David Woodhouse
2008-07-01 15:29 ` Alan Cox
2008-07-02 9:01 ` David Woodhouse
2008-07-02 9:17 ` Alan Cox
2008-07-02 9:50 ` David Woodhouse
2008-07-02 9:43 ` Alan Cox
2008-07-01 12:35 Stephen Rothwell
2008-07-01 11:57 Stephen Rothwell
2008-07-01 11:59 ` Felipe Balbi
2008-07-01 15:25 ` Greg KH
2008-07-01 11:44 Stephen Rothwell
2008-07-01 11:37 Stephen Rothwell
2008-07-01 11:33 Stephen Rothwell
2008-07-12 18:59 ` Jesper Juhl
2008-07-12 20:29 ` Alan Cox
2008-07-13 1:20 ` Stephen Rothwell
2008-07-01 11:23 Stephen Rothwell
2008-07-01 11:17 Stephen Rothwell
2008-07-01 11:10 Stephen Rothwell
2008-07-01 11:56 ` Alan Cox
2008-07-01 16:18 ` David Brownell
2008-07-01 16:27 ` Alan Cox
2008-07-01 10:59 Stephen Rothwell
2008-07-01 10:59 ` 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=494127CC.6060800@intel.com \
--to=dan.j.williams@intel.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=ddaney@caviumnetworks.com \
--cc=linux-next@vger.kernel.org \
--cc=sfr@canb.auug.org.au \
/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.