Received-SPF: pass (google.com: domain of code@wizofe.uk designates 185.20.209.243 as permitted sender) client-ip=185.20.209.243;
Date: Wed, 31 Oct 2018 21:24:51 +0000
From: Ioannis Valasakis <code@wizofe.uk>
To: Sasha Levin <sashal@kernel.org>
Cc: Julia Lawall <julia.lawall@lip6.fr>, outreachy-kernel@googlegroups.com,
	gregkh@linuxfoundation.org, sasha.levin@microsoft.com
Subject: Re: [Outreachy kernel] [PATH v3] staging: gasket: Create a memory
 allocation error handling path
Message-ID: <20181031212451.GA10228@kvasir.local>
References: <20181031205636.GA13583@kvasir.local>
 <alpine.DEB.2.21.1810312158190.2391@hadrien>
 <20181031211626.GW194472@sasha-vm>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20181031211626.GW194472@sasha-vm>
User-Agent: Mutt/1.10.1 (2018-07-13)

On Wed, Oct 31, 2018 at 05:16:26PM -0400, Sasha Levin wrote:
> On Wed, Oct 31, 2018 at 09:58:58PM +0100, Julia Lawall wrote:
> > 
> > 
> > On Wed, 31 Oct 2018, Ioannis Valasakis wrote:
> > 
> > > Create an error handling path for memory allocation. It avoids repeating
> > > the same assignments and returns the respective ENOMEM.
> > 
> > I think you are again making a patch based on your previous patch.  You
> > need to undo everything to get back to the state of Greg's tree.
> 
> An easy way to deal with the situation you're in now is to use git's
> interactive rebase. Interactive rebase lets you merge ("squash") two
> or more commits together, so you can merge all your commits on top of
> Greg's tree into a single commit.
Thank you Sasha for your helpful comment. I tried already with git's
rebase option but that made it a bit complicated as apparently the
source tree had many changes (even one of the memory allocations was
totally removed!)

That's why I just removed my commits and did a fresh git checkout master
&& git pull. Apparently thousands of changes can happen at very specific
times of the day :) 

Is there an 'automatic way' to do often git pulls, so you are sure you
are working on the latest source tree?

Best
Ioannis

> 
> To use that, try: "git rebase -i HEAD~5". The number "5" stands for the
> amount of commits to go back; if you have more than that feel free to
> change this number to a more appropriate one.
> 
> Once you've done that, you will see an editor window with lines in the
> form of:
> 
> 	pick [commit hash] [commit subject]
> 	[...]
> 
> You can merge a commit with a previous commit by changing "pick" into
> "fixup", and then saving and closing the editor.
> 
> For example:
> 
> 	pick 11111111 "my first commit"
> 	fixup 22222222 "my second commit"
> 	pick 33333333 "my third commit"
> 
> Using the above, git will merge the second commit into the first, and
> leave the third one as it is.
> 
> --
> Thanks,
> Sasha