From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Miller Subject: Re: pull request [net]: batman-adv 20160117 Date: Sun, 17 Jan 2016 01:04:46 -0500 (EST) Message-ID: <20160117.010446.1772166493922910087.davem@davemloft.net> References: <1453008281-15396-1-git-send-email-a@unstable.cc> Reply-To: The list for a Better Approach To Mobile Ad-hoc Networking Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Cc: netdev-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, b.a.t.m.a.n-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org To: a@unstable.cc Return-path: In-Reply-To: <1453008281-15396-1-git-send-email-a-2CpIooy/SPIKlTDg6p0iyA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: b.a.t.m.a.n-bounces-ZwoEplunGu2X36UT3dwllkB+6BGkLq7r@public.gmane.org Sender: "B.A.T.M.A.N" List-Id: netdev.vger.kernel.org From: Antonio Quartulli Date: Sun, 17 Jan 2016 13:24:33 +0800 > here you have a bunch of patches intended for net. Pulled, but you really need to sort something out. You give really nice detailed, high level, descriptions of your changes here in this pull request. It is awesome. But then you include other text in the merge commit I end up getting when I pull. I don't want that _UNLESS_ it's exactly what you're saying here in this email and therefore is what I would have put there anyways. When I did this time is just concatenate them together and therefore including both things. But I don't want to have to even think about this in the future. Just let me include what you say in this email or put exactly this text into that merge commit. Thanks. From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Date: Sun, 17 Jan 2016 01:04:46 -0500 (EST) Message-Id: <20160117.010446.1772166493922910087.davem@davemloft.net> From: David Miller In-Reply-To: <1453008281-15396-1-git-send-email-a@unstable.cc> References: <1453008281-15396-1-git-send-email-a@unstable.cc> Mime-Version: 1.0 Content-Type: Text/Plain; charset=us-ascii Content-Transfer-Encoding: 7bit Subject: Re: [B.A.T.M.A.N.] pull request [net]: batman-adv 20160117 List-Id: The list for a Better Approach To Mobile Ad-hoc Networking List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: a@unstable.cc Cc: netdev@vger.kernel.org, b.a.t.m.a.n@lists.open-mesh.org From: Antonio Quartulli Date: Sun, 17 Jan 2016 13:24:33 +0800 > here you have a bunch of patches intended for net. Pulled, but you really need to sort something out. You give really nice detailed, high level, descriptions of your changes here in this pull request. It is awesome. But then you include other text in the merge commit I end up getting when I pull. I don't want that _UNLESS_ it's exactly what you're saying here in this email and therefore is what I would have put there anyways. When I did this time is just concatenate them together and therefore including both things. But I don't want to have to even think about this in the future. Just let me include what you say in this email or put exactly this text into that merge commit. Thanks.