Re: [leaf-devel] git master

2016-03-04 Thread kp kirchdoerfer
Hi Erich; Am Freitag, 4. März 2016, 22:50:09 schrieb Erich Titl: > Hi Folks > > I am trying to rebase new-initrd to master and failing miserably due to > weird (for me) conflicts. In order to make progress I would like to > suggest to clean up master in a way to be at least consistent with the >

[leaf-devel] git master

2016-03-04 Thread Erich Titl
Hi Folks I am trying to rebase new-initrd to master and failing miserably due to weird (for me) conflicts. In order to make progress I would like to suggest to clean up master in a way to be at least consistent with the actual kernel release, e.g. the person responsable for the introduction of 4.4