On 9/28/2016 4:37 PM, Greg KH wrote: > 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@xxxxxxxxxxxx> >>>> --- >>>> 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 Thanks for the feedback. I'll work against your staging-next branch and submit the corrected patch. BRs, Ramiro _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
