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, 4 Sep 2017 16:07:56 +1000 From: Stephen Rothwell <sfr@...b.auug.org.au> To: Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>, "H. Peter Anvin" <hpa@...or.com>, Peter Zijlstra <peterz@...radead.org>, Mark Brown <broonie@...nel.org> Cc: Linux-Next Mailing List <linux-next@...r.kernel.org>, Linux Kernel Mailing List <linux-kernel@...r.kernel.org>, Andy Shevchenko <andriy.shevchenko@...ux.intel.com>, Juergen Gross <jgross@...e.com> Subject: Re: linux-next: manual merge of the tip tree with the spi tree Hi all, On Mon, 28 Aug 2017 14:05:03 +1000 Stephen Rothwell <sfr@...b.auug.org.au> wrote: > > Today's linux-next merge of the tip tree got a conflict in: > > tools/Makefile > > between commit: > > e9d4650dcc59 ("spi: tools: add install section") > > from the spi tree and commit: > > ecda85e70277 ("x86/lguest: Remove lguest support") > > from the tip 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. > > -- > Cheers, > Stephen Rothwell > > diff --cc tools/Makefile > index 616e7722b327,a19b176b914b..000000000000 > --- a/tools/Makefile > +++ b/tools/Makefile > @@@ -90,8 -89,8 +89,8 @@@ freefall: FORC > kvm_stat: FORCE > $(call descend,kvm/$@) > > - all: acpi cgroup cpupower gpio hv firewire lguest liblockdep \ > + all: acpi cgroup cpupower gpio hv firewire liblockdep \ > - perf selftests turbostat usb \ > + perf selftests spi turbostat usb \ > virtio vm net x86_energy_perf_policy \ > tmon freefall objtool kvm_stat > > @@@ -101,7 -100,7 +100,7 @@@ acpi_install > cpupower_install: > $(call descend,power/$(@:_install=),install) > > - cgroup_install firewire_install gpio_install hv_install lguest_install perf_install spi_install usb_install virtio_install vm_install net_install objtool_install: > -cgroup_install firewire_install gpio_install hv_install perf_install usb_install virtio_install vm_install net_install objtool_install: > ++cgroup_install firewire_install gpio_install hv_install perf_install spi_install usb_install virtio_install vm_install net_install objtool_install: > $(call descend,$(@:_install=),install) > > liblockdep_install: Just a reminder that this conflict still exists. -- Cheers, Stephen Rothwell
Powered by blists - more mailing lists