linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Greg KH <greg@kroah.com>
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: linux-next: manual merge of the staging tree with the vfs tree
Date: Mon, 24 Sep 2012 17:07:41 +1000	[thread overview]
Message-ID: <20120924170741.34abbc462d1c405b0b447b72@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1232 bytes --]

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).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc drivers/staging/android/binder.c
index f71d624,a807129..0000000
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@@ -362,9 -362,14 +362,9 @@@ struct binder_transaction 
  static void
  binder_defer_work(struct binder_proc *proc, enum binder_deferred_state defer);
  
- int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
 -/*
 - * copied from get_unused_fd_flags
 - */
+ static int task_get_unused_fd_flags(struct binder_proc *proc, int flags)
  {
  	struct files_struct *files = proc->files;
 -	int fd, error;
 -	struct fdtable *fdt;
  	unsigned long rlim_cur;
  	unsigned long irqs;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-09-24  7:07 UTC|newest]

Thread overview: 35+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-09-24  7:07 Stephen Rothwell [this message]
2012-09-25 22:38 ` linux-next: manual merge of the staging tree with the vfs tree Greg KH
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=20120924170741.34abbc462d1c405b0b447b72@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=greg@kroah.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=sachin.kamat@linaro.org \
    --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 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).