| 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 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <alpine.LNX.1.10.0806190143230.4593@jikos.suse.cz> Date: Thu, 19 Jun 2008 01:48:40 +0200 (CEST) From: Jiri Kosina <jkosina@...e.cz> To: James Bottomley <James.Bottomley@...senpartnership.com> cc: benh@...nel.crashing.org, ksummit-2008-discuss@...ts.linux-foundation.org, linux-kernel <linux-kernel@...r.kernel.org> Subject: Re: [Ksummit-2008-discuss] Request for discussion on when to merge drivers On Wed, 18 Jun 2008, James Bottomley wrote: > Arguably, I can do this by putting it into my upstream tree (which feeds > into linux-next) the reason for not doing so is that Linus likes us to > preserve history in there when we can. This of course applies only for branches/trees for which there are downstream git users. If the only reason you merge the driver into your tree is to have it propagated into linux-next, you could very well create a separate branch for it, and pull this branch into the one linux-next pulls from you (I guess you have a dedicated branch for linux-next which is safe to be rebased by definition, right?). > If I need to pull the driver for a reroll it really screws the git > history But not in any of the branches that have upstream git users. -- Jiri Kosina SUSE Labs -- 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