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: Mon, 26 Jun 2017 11:29:58 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Mauro Carvalho Chehab <mchehab@....samsung.com> Cc: Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org> Subject: linux-next: manual merge of the v4l-dvb-next tree with the v4l-dvb-fixes tree Hi Mauro, Today's linux-next merge of the v4l-dvb-next tree got conflicts in: Documentation/media/uapi/dvb/fe-diseqc-send-burst.rst Documentation/media/uapi/dvb/fe-set-tone.rst Documentation/media/uapi/dvb/fe-set-voltage.rst between commit: affd250dec17 ("[media] dvb uapi docs: enums are passed by value, not reference") from the v4l-dvb-fixes tree and commit: d9c4615854ec ("[media] dvb uapi docs: enums are passed by value, not reference") from the v4l-dvb-next tree. I fixed it up (I used the version from the former tree since it was committed more recently) 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