linux-kernel - linux-next: manual merge of the v4l-dvb tree

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-next>] [day] [month] [year] [list]

Date:	Thu, 13 May 2010 13:00:16 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Mauro Carvalho Chehab <mchehab@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: linux-next: manual merge of the v4l-dvb tree

Hi Mauro,

Today's linux-next merge of the v4l-dvb tree produced a mountain of
conflicts so I have used the version from next-20100512 for today.
Please either merge Linus' tree into yours or rebase you tree on top of
Linus' tree.  There are a large number of commits that are in your tree
that have been rebased before being included into Linus' tree and this
caused conflicts with further changes in your tree.

Please consider changing your work flow so that you don't rebase things
in your tree before sending them to Linus.

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

Content of type "application/pgp-signature" skipped