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,
Alan Cox <alan@linux.intel.com>,
Paul Gortmaker <paul.gortmaker@windriver.com>
Subject: Re: linux-next: manual merge of the staging tree with the tty tree
Date: Mon, 7 May 2012 07:48:07 -0700 [thread overview]
Message-ID: <20120507144807.GA21302@kroah.com> (raw)
In-Reply-To: <20120507155831.a84a079857b24b7772333a37@canb.auug.org.au>
On Mon, May 07, 2012 at 03:58:31PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/serial/68360serial.c between commit d29f3ef39be4
> ("tty_lock: Localise the lock") from the tty tree and commit 60e6d2689c2a
> ("staging: evict abandoned 68360serial.c driver from the kernel") from
> the staging tree.
>
> The latter removed the file, so I did that.
That sounds correct, thanks for doing it.
greg k-h
next prev parent reply other threads:[~2012-05-07 14:48 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-07 5:58 linux-next: manual merge of the staging tree with the tty tree Stephen Rothwell
2012-05-07 14:48 ` Greg KH [this message]
2012-09-13 6:14 Stephen Rothwell
2012-09-13 6:59 ` Samuel Iglesias Gonsálvez
2012-09-13 7:36 ` Stephen Rothwell
2012-09-17 7:37 Stephen Rothwell
2012-09-17 11:20 ` Greg KH
2012-11-28 5:14 Stephen Rothwell
2012-11-28 16:47 ` Greg KH
2012-11-29 4:47 Stephen Rothwell
2012-11-29 5:17 ` Greg KH
2016-02-01 3:51 Stephen Rothwell
2016-02-01 4:01 ` Greg KH
2017-06-05 4:57 Stephen Rothwell
2017-06-05 6:50 ` Greg KH
2022-10-04 6:33 Stephen Rothwell
2022-10-04 8:26 ` 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=20120507144807.GA21302@kroah.com \
--to=greg@kroah.com \
--cc=alan@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=paul.gortmaker@windriver.com \
--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 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).