Kernel bug caused by 'git apply' misapplying a patch with ambiguous chunk

2015-04-02 Thread Mikko Perttunen
Hello everyone, we recently ran into a kernel bug caused by git misapplying this patch: https://lkml.org/lkml/2014/7/3/896 . The chunk '@@ -653,6 +655,7 @@' in tegra124.dtsi (the second file in the patch) has ambiguous context (there are several almost identical PHY nodes in the file). Git

Re: Kernel bug caused by 'git apply' misapplying a patch with ambiguous chunk

2015-04-02 Thread Junio C Hamano
Mikko Perttunen mikko.perttu...@kapsi.fi writes: Of course this is probably rather hard to fix on the applying end; but perhaps format-patch could check for ambiguous chunks and either warn the user or increase the context size automatically, or apply could warn about the chunk being

Re: Kernel bug caused by 'git apply' misapplying a patch with ambiguous chunk

2015-04-02 Thread Mikko Perttunen
On 04/02/2015 06:59 PM, Junio C Hamano wrote: Mikko Perttunen mikko.perttu...@kapsi.fi writes: Of course this is probably rather hard to fix on the applying end; but perhaps format-patch could check for ambiguous chunks and either warn the user or increase the context size automatically, or