On Wed, Nov 21, 2012 at 2:01 AM, Kumar amit mehta <gmate.amit@gmail.com> wrote:
On Wed, Nov 21, 2012 at 01:51:14AM -0500, devendra.aaru wrote:
On Wed, Nov 21, 2012 at 1:43 AM, Kumar amit mehta <gmate.amit@gmail.com> wrote:
On Wed, Nov 21, 2012 at 12:52:58AM -0500, devendra.aaru wrote:
On Wed, Nov 21, 2012 at 12:36 AM, Kumar amit mehta <gmate.amit@gmail.com> wrote:
Hi,
After some discussions that happened over kernel newbie mailing list in past, I've managed to send some trivial patches to linux janitors and to relevant maintainers. My patch base has been linux-next tree and I'm glad that some of them got merged. Recently, for one of my patch, I got a reply from the subsystem maintainer that my patch doesn't apply to his tree anymore and asked me to do a refresh and try again. To make things clear, please find the steps that I've followed to clone linux-next tree: amit@ubuntu:~$ mkdir lkernel
amit@ubuntu:~$ cd lkernel
amit@ubuntu:~/lkernel$ git init Initialized empty Git repository in /home/amit/lkernel/.git/
amit@ubuntu:~/lkernel$ git remote add linux-next git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
amit@ubuntu:~/lkernel$ git fetch linux-next
amit@ubuntu:~/lkernel$ git fetch --tags linux-next
amit@ubuntu:~/lkernel$ git tag -l next-* next-20120816 next-20120817 next-20120820 next-20120821 ............ ............ next-20121114 next-20121115 < -- --- (Most recent tag)
amit@ubuntu:~/lkernel$ git checkout next-20121115 -b Nov-15
amit@ubuntu:~/lkernel$ git branch * Nov-15
So *Nov-15* is my local branch and here I did some changes and did a commit amit@ubuntu:~/lkernel$ git add <some file in staging directory> amit@ubuntu:~/lkernel$ git commt -a
amit@ubuntu:~/lkernel$ git status # On branch Nov-15 nothing to commit (working directory clean)
I forgot to send this patch for couple of days and maybe that was reason, my patch couldn't apply(as mentioned by the subsystem maintainer). So still being on my *Nov-15" branch, today(November 21, 2012), I invoked, following commands to get the latest tags:
amit@ubuntu:~/lkernel$ git branch * Nov-15
amit@ubuntu:~/lkernel$ git remote update amit@ubuntu:~/lkernel$ git fetch linux-next amit@ubuntu:~/lkernel$ git fetch --tags linux-next
I was hoping to get new tags, but to my surprise there hasn't been any new releases. This makes me think that something is wrong with my git setup.
My git configuration: amit@ubuntu:~/lkernel$ git config --list user.name=<my name> user.email=<my Email ID> credential.helper=cache --timeout=3600 sendemail.smtpserver=<gmail smtp server> sendemail.smtpserverport=<port> sendemail.smtpencryption=<encryption> sendemail.smtpuser=<my email ID> color.ui=true color.status=auto color.branch=auto push.default=matching branch.autosetuprebase=always core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true remote.linux-next.url=git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git remote.linux-next.fetch=+refs/heads/*:refs/remotes/linux-next/* branch.master.remote=linux-next branch.master.merge=refs/heads/master branch.master.rebase=true
Please confirm if everything is okay with my git setup and I need not worry if I do not see any new tags for sometime.
the case is where in which the maintainer will have a new tree for the patches and next didnt' updated to the latest maintainer tree, and there is people who worked on the same thing and thats why it didn't applied.
Thank you for your reply. So If I did a refresh (git remote update) and then again checked out the tree with the latest tag(Note, that my previous branch was based off next-20121115 tag and even after 5 days I still see next-20121115 as the latest tag), I should be fine ?
In case you've been monitoring linux-next tree, then can you please issue the following command and post what you get. $ git tag -l next-*|tail -n 1
no i meant use the maintainer's git in that cases, not the next So, my understanding is that To be more cautious, I should still be basing my work on linux-next tree and before sending the patch to the maintainer, I should do a dry run against the maintainer's tree. CMIIW.
that maintainer's tree is next tree so that next can pickup. once the next pics up your changes gets merged there in next. always its good to work against' maintainers trees, if its a fix then its better work on the maintainer's torvalds's tree otherwise the next tree in maintainer's repo