netdev - Re: README: networking GIT trees

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:	Mon, 8 Aug 2011 17:32:03 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	David Miller <davem@...emloft.net>
Cc:	netdev@...r.kernel.org, jeffrey.t.kirsher@...el.com
Subject: Re: README: networking GIT trees

Hi Dave,

On Sun, 07 Aug 2011 23:40:27 -0700 (PDT) David Miller <davem@...emloft.net> wrote:
>
> net-next is now open up and all pending -next patches have been
> integrated and pushed out.  Also, the plain 'net' tree has been
> pulled into it.
> 
> However I am freezing driver/net in net-next so that Jeff can
> have a few days to push his drivers/net reorganization GIT tree
> to me.
> 
> Once Jeff's work is merged in, I do recognize that we will have
> some merge hassles any time a net driver bug fix is merged into
> the 'net' tree.  I will try to pre-emptively address this with
> quick merges into net-next when possible.
> 
> This is just a heads up if one of these merge hassles propagates
> into -next for some reason, they are expected and I will clean
> them up as fast as possible.

Thanks for the heads up.  If I do come across one of these, I will still
report it (just to let people know what I did) but you can ignore my
reports if you have already fixed the problem.

-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au
http://www.canb.auug.org.au/~sfr/

Content of type "application/pgp-signature" skipped