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, 29 Aug 2017 16:35:13 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Greg KH <greg@...ah.com>, Helge Deller <deller@....de>, Parisc List <linux-parisc@...r.kernel.org> Cc: Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Arvind Yadav <arvind.yadav.cs@...il.com> Subject: linux-next: manual merge of the tty tree with the parisc-hd tree Hi Greg, Today's linux-next merge of the tty tree got a conflict in: drivers/tty/serial/8250/8250_gsc.c between commit: 9e466f101e19 ("parisc/8250_gsc: Fix section mismatches") from the parisc-hd tree and commit: 0d474f7fad3b ("tty: 8250: constify parisc_device_id") from the tty tree. I fixed it up (the former is a superset of the latter) and can carry the fix as necessary. This is now fixed as far as linux-next is concerned, but any non trivial conflicts should be mentioned to your upstream maintainer when your tree is submitted for merging. You may also want to consider cooperating with the maintainer of the conflicting tree to minimise any particularly complex conflicts. -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists