linux-kernel - Re: linux-next: manual merge of the watchdog tree with the 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-prev] [thread-next>] [day] [month] [year] [list]

Date:	Fri, 25 Dec 2009 10:52:28 +0100
From:	Wim Van Sebroeck <wim@...ana.be>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Ralf Baechle <ralf@...ux-mips.org>,
	H Hartley Sweeten <hartleys@...ionengravers.com>
Subject: Re: linux-next: manual merge of the watchdog tree with the  tree

Thanks Stephen,

That was indeed correct. I fixed the patch.

Kind regards,
Wim.

> Hi Wim,
> 
> Today's linux-next merge of the watchdog tree got a conflict in
> drivers/watchdog/rm9k_wdt.c between commit
> de4148f3ef54b644a181ad75a6fb4b373f2b01f0 ("MIPS: eXcite: Remove
> platform") from Linus' tree and commit
> f277223000a651df741e2e3367b498049139298d ("[WATCHDOG] use resource_size
> ()") from the watchdog tree.
> 
> The former commit removes the file changed by the latter.  I just removed
> the file.
> -- 
> Cheers,
> Stephen Rothwell                    sfr@...b.auug.org.au
> http://www.canb.auug.org.au/~sfr/


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