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,
Sachin Kamat <sachin.kamat@linaro.org>,
Al Viro <viro@zeniv.linux.org.uk>
Subject: Re: linux-next: manual merge of the staging tree with the vfs tree
Date: Tue, 25 Sep 2012 15:38:44 -0700 [thread overview]
Message-ID: <20120925223844.GA6282@kroah.com> (raw)
In-Reply-To: <20120924170741.34abbc462d1c405b0b447b72@canb.auug.org.au>
On Mon, Sep 24, 2012 at 05:07:41PM +1000, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the staging tree got a conflict in
> drivers/staging/android/binder.c between commit 004223461eee ("new
> helper: __alloc_fd()") from the vfs tree and commits efde99cd281a
> ("Staging: android: binder: Make task_get_unused_fd_flags function
> static") and bf2023614201 ("Staging: android: binder: Remove an
> inconsequential conditional macro") from the staging tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).
Looks good to me, thanks.
greg k-h
next prev parent reply other threads:[~2012-09-25 22:38 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-24 7:07 linux-next: manual merge of the staging tree with the vfs tree Stephen Rothwell
2012-09-25 22:38 ` Greg KH [this message]
-- strict thread matches above, loose matches on Subject: below --
2013-04-04 4:34 Stephen Rothwell
2013-04-05 1:45 ` Greg KH
2013-04-04 4:40 Stephen Rothwell
2013-04-05 1:45 ` Greg KH
2013-04-04 4:43 Stephen Rothwell
2013-04-05 1:44 ` Greg KH
2013-04-10 5:54 Stephen Rothwell
2013-04-10 14:57 ` Greg KH
2014-11-03 2:29 Stephen Rothwell
2014-11-03 23:57 ` Greg KH
2014-11-03 2:31 Stephen Rothwell
2014-11-03 2:39 Stephen Rothwell
2014-11-27 9:11 Stephen Rothwell
2014-11-27 9:31 ` Stephen Rothwell
2014-11-27 16:20 ` Greg KH
2014-12-15 4:06 Stephen Rothwell
2016-05-03 6:44 Stephen Rothwell
2016-05-03 18:19 ` Greg KH
2016-09-20 5:03 Stephen Rothwell
2016-09-20 11:14 ` Greg KH
2016-12-12 4:21 Stephen Rothwell
2017-11-09 4:01 Stephen Rothwell
2017-11-09 8:34 ` Greg KH
2017-12-04 1:58 Stephen Rothwell
2017-12-04 9:09 ` Greg KH
2017-12-04 2:06 Stephen Rothwell
2017-12-04 9:10 ` Greg KH
2018-03-13 4:22 Stephen Rothwell
2018-03-13 8:47 ` Greg KH
2018-10-09 4:59 Stephen Rothwell
2018-10-09 9:18 ` Greg KH
2020-03-12 5:16 Stephen Rothwell
2020-03-12 7:36 ` 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=20120925223844.GA6282@kroah.com \
--to=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=sachin.kamat@linaro.org \
--cc=sfr@canb.auug.org.au \
--cc=viro@zeniv.linux.org.uk \
/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.