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 08:52:27 +0200
From:	Ingo Molnar <mingo@...e.hu>
To:	Stefan Richter <stefanr@...6.in-berlin.de>
Cc:	Stephen Rothwell <sfr@...b.auug.org.au>,
	linux-next@...r.kernel.org, LKML <linux-kernel@...r.kernel.org>
Subject: Re: linux-next: Tree for April 9


* Stefan Richter <stefanr@...6.in-berlin.de> wrote:

> Stephen Rothwell wrote:
> > There were a few merge conflicts (fairly trivial) and couple of build
> > failures (notified).  There is a know build failure with powerpc
> > allyesconfig.  Below is a summary of the state of the merge.
> ...
> > Merging ieee1394/for-next
> > CONFLICT (content): Merge conflict in lib/Kconfig.debug
> 
> Would it be safe for me (and preferred by you) to merge sched/for-akpm 
> into ieee1394/for-next to resolve this conflict until next mainline 
> merge?

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.

	Ingo
--
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/