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,
Ming Lei <ming.lei@canonical.com>, Takashi Iwai <tiwai@suse.de>
Subject: Re: linux-next: manual merge of the driver-core tree with the driver-core.current tree
Date: Tue, 18 Jun 2013 22:55:00 -0700 [thread overview]
Message-ID: <20130619055500.GA5283@kroah.com> (raw)
In-Reply-To: <20130619153225.9ff68f0984bfa54333c4df10@canb.auug.org.au>
On Wed, Jun 19, 2013 at 03:32:25PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/base/firmware_class.c between commit 875979368eb4 ("firmware
> loader: fix use-after-free by double abort") from the driver-core.current
> tree and commit fe304143b0c3 ("firmware: Avoid deadlock of usermodehelper
> lock at shutdown") from the driver-core tree.
>
> I fixed it up (more may be required - see below) and can carry the fix as
> necessary (no action is required).
Thanks, the merge looks correct, Ming, any objection?
greg k-h
next prev parent reply other threads:[~2013-06-19 5:54 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-19 5:32 linux-next: manual merge of the driver-core tree with the driver-core.current tree Stephen Rothwell
2013-06-19 5:55 ` Greg KH [this message]
2013-06-19 6:58 ` Ming Lei
2013-06-19 14:39 ` Greg KH
2013-06-19 15:04 ` Ming Lei
2013-06-19 16:36 ` Greg KH
2013-06-20 0:23 ` Ming Lei
2013-06-20 1:06 ` Stephen Rothwell
2013-06-20 1:22 ` Ming Lei
2013-06-20 3:28 ` Greg KH
2013-06-20 3:46 ` Ming Lei
2013-06-20 3:49 ` Stephen Rothwell
2013-06-19 7:12 ` Stephen Rothwell
2013-06-19 7:21 ` Ming Lei
-- strict thread matches above, loose matches on Subject: below --
2026-01-07 4:29 Stephen Rothwell
2026-01-07 14:38 ` Danilo Krummrich
2020-04-30 4:25 Stephen Rothwell
2020-04-30 8:15 ` Greg KH
2013-12-09 3:47 Stephen Rothwell
2013-12-09 8:21 ` Greg KH
2012-02-03 3:51 Stephen Rothwell
2012-02-03 15:07 ` 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=20130619055500.GA5283@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=ming.lei@canonical.com \
--cc=sfr@canb.auug.org.au \
--cc=tiwai@suse.de \
/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.