From: Greg KH <gregkh@linuxfoundation.org>
To: Ramiro Oliveira <Ramiro.Oliveira@synopsys.com>
Cc: arve@android.com, riandrews@android.com,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] Staging: android: fix permissions style
Date: Wed, 28 Sep 2016 17:37:44 +0200 [thread overview]
Message-ID: <20160928153744.GA1692@kroah.com> (raw)
In-Reply-To: <4888f21f-b855-42d8-5307-5eadd3f837d7@synopsys.com>
On Wed, Sep 28, 2016 at 02:48:39PM +0100, Ramiro Oliveira wrote:
> On 9/28/2016 10:28 AM, Greg KH wrote:
> > On Mon, Sep 26, 2016 at 10:02:28PM +0100, Ramiro Oliveira wrote:
> >> Change permissions from symbolic to octal.
> >>
> >> Signed-off-by: Ramiro Oliveira <roliveir@synopsys.com>
> >> ---
> >> drivers/staging/android/lowmemorykiller.c | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> > Doesn't apply to my tree at all, are you sure you are working against
> > linux-next?
> >
> > thanks,
> >
> > greg k-h
>
> Hi Greg,
>
> I've checked and I'm working with linux-next from September 28.
>
> I've even cloned a fresh repository and applied my patch against it, and it didn't return any error.
>
> I'm following this man page: https://www.kernel.org/doc/man-pages/linux-next.html
>
> And these are the latest commits I can see in my local repository.
>
> ramiro (28-Set) ~/linux-next $ git log --pretty=oneline --abbrev-commit -10
> 486aa34 Staging: android: fix permissions style
> d1dfecd Add linux-next specific files for 20160928
> 193fc13 Merge branch 'akpm/master'
> 0a02a3c treewide: remove redundant #include <linux/kconfig.h>
> 8cac28f hung_task-allow-hung_task_panic-when-hung_task_warnings-is-0-fix
> 25758d2 hung_task: allow hung_task_panic when hung_task_warnings is 0
> ceed084 kthread: add kerneldoc for kthread_create()
> 998139d scripts/tags.sh: enable code completion in VIM
> b6edcec mm: kmemleak: avoid using __va() on addresses that don't have a lowmem mapping
> 73ac410 kdump, vmcoreinfo: report memory sections virtual addresses
>
> Can you give some pointers on what I might be doing wrong?
Hm, I think this is my fault, sorry. The patch that this conflicts with
was applied by me yesterday, and didn't make it into linux-next for the
release that you are using.
Sorry about that. You can wait for the next linux-next release
tomorrow, or you can work off my staging-next branch of the staging.git
tree on git.kernel.org (that branch ends up in linux-next.)
So you were doing the right thing, we just got out of sync.
greg k-h
next prev parent reply other threads:[~2016-09-28 15:37 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-26 21:02 [PATCH] Staging: android: fix permissions style Ramiro Oliveira
2016-09-27 17:43 ` Joe Perches
2016-09-28 9:28 ` Greg KH
2016-09-28 13:48 ` Ramiro Oliveira
2016-09-28 15:37 ` Greg KH [this message]
2016-09-28 15:49 ` Ramiro Oliveira
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=20160928153744.GA1692@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=Ramiro.Oliveira@synopsys.com \
--cc=arve@android.com \
--cc=devel@driverdev.osuosl.org \
--cc=linux-kernel@vger.kernel.org \
--cc=riandrews@android.com \
/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