Received-SPF: pass (google.com: domain of sashal@kernel.org designates 198.145.29.99 as permitted sender) client-ip=198.145.29.99;
Date: Wed, 31 Oct 2018 17:16:26 -0400
From: Sasha Levin <sashal@kernel.org>
To: Julia Lawall <julia.lawall@lip6.fr>
Cc: Ioannis Valasakis <code@wizofe.uk>, 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: <20181031211626.GW194472@sasha-vm>
References: <20181031205636.GA13583@kvasir.local>
 <alpine.DEB.2.21.1810312158190.2391@hadrien>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii; format=flowed
Content-Disposition: inline
In-Reply-To: <alpine.DEB.2.21.1810312158190.2391@hadrien>
User-Agent: Mutt/1.9.4 (2018-02-28)

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.

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