lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Thu, 17 Jul 2014 05:18:04 +0300
From:	Kalle Valo <kvalo@...rom.com>
To:	"John W. Linville" <linville@...driver.com>
Cc:	David Miller <davem@...emloft.net>, torvalds@...ux-foundation.org,
	akpm@...ux-foundation.org, netdev@...r.kernel.org,
	linux-kernel@...r.kernel.org
Subject: Re: [GIT] Networking

"John W. Linville" <linville@...driver.com> writes:

> On Tue, Jul 15, 2014 at 11:46:14AM -0700, David Miller wrote:
>> From: Linus Torvalds <torvalds@...ux-foundation.org>
>> Date: Tue, 15 Jul 2014 08:52:33 -0700
>> 
>> > And if David actually asks for these, my apologies..
>> 
>> I didn't ask for these :-)
>
> Just trying to be helpful, for those times when there are non-trivial
> merge conflicts.  I can stop.

Just out of curiosity, what is the best way to send a proposal how to
fix a merge conflict? For example, if I send a pull request to John
which I know will issue a conflict it would be nice to include
instructions (or some sort of patch) how I think it should be resolved.

-- 
Kalle Valo
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists