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
| ||
|
Date: Tue, 1 Oct 2013 06:53:36 -0700 From: Greg Kroah-Hartman <gregkh@...uxfoundation.org> To: Thierry Reding <thierry.reding@...il.com> Cc: Paul Mundt <lethal@...ux-sh.org>, Simon Horman <horms+renesas@...ge.net.au>, linux-next@...r.kernel.org, linux-kernel@...r.kernel.org Subject: Re: linux-next: manual merge of the sh tree On Tue, Oct 01, 2013 at 01:07:23PM +0200, Thierry Reding wrote: > Today's linux-next merge of the sh tree got conflicts in > > arch/sh/kernel/cpu/sh2a/Makefile > drivers/tty/serial/sh-sci.c > include/linux/serial_sci.h > > I fixed them up (see below). Please check if the resolution looks correct. Looks correct to me, thanks for doing this. greg k-h -- 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/
Powered by blists - more mailing lists