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 PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Fri, 22 Dec 2017 11:41:27 +0530 From: Kishon Vijay Abraham I <kishon@...com> To: Tony Lindgren <tony@...mide.com>, Stephen Rothwell <sfr@...b.auug.org.au> CC: Santosh Shilimkar <santosh.shilimkar@...cle.com>, Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org> Subject: Re: linux-next: manual merge of the omap tree with the keystone tree On Friday 22 December 2017 04:42 AM, Tony Lindgren wrote: > * Stephen Rothwell <sfr@...b.auug.org.au> [171221 21:48]: >> Hi Tony, >> >> Today's linux-next merge of the omap tree got a conflict in: >> >> arch/arm/configs/multi_v7_defconfig >> >> between commit: >> >> d3b15c54ed7e ("ARM: config: sync multi-v7 config with keystone peripherals") >> >> from the keystone tree and commit: >> >> d03366dcbffc ("ARM: multi_v7_defconfig: Enable CONFIG_PCI_DRA7XX (Host & Device modes)") >> >> from the omap tree. >> >> I fixed it up (see below) 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. > > Thanks I'll wait on this one so Kishon can check the resulting next. omap2plus_defconfig on linux-next looks fine. Thanks Kishon
Powered by blists - more mailing lists