linux-kernel - Re: linux-next: Tree for April 9

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

Date:	Thu, 10 Apr 2008 17:44:18 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Ingo Molnar <mingo@...e.hu>
Cc:	Stefan Richter <stefanr@...6.in-berlin.de>,
	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for April 9

On Thu, 10 Apr 2008 08:52:27 +0200 Ingo Molnar <mingo@...e.hu> wrote:
>
> what type of conflict do you have there? If it's a new entry then you 
> might be able to fix it by moving the new entry elsewhere in the file. 
> Or if i introduced a new entry close to an existing entry you modify 
> then i could move my new entry elsewhere.

Commit 523a65f1a7a339e528ca6d6d808516fe195fde03 ("firewire: fw-ohci: add
option for remote debugging") in the ieee1394 tree adds a new entry just
where the sched tree adds

source kernel/trace/Kconfig

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

Content of type "application/pgp-signature" skipped