[lkml]   [2019]   [Dec]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
SubjectRe: linux-next: manual merge of the staging tree with the staging.current tree
On Fri, Dec 13, 2019 at 12:05:34PM +1100, Stephen Rothwell wrote:
> Hi all,
> Today's linux-next merge of the staging tree got a conflict in:
> drivers/staging/isdn/gigaset/usb-gigaset.c
> between commits:
> 53f35a39c386 ("staging: gigaset: fix general protection fault on probe")
> 84f60ca7b326 ("staging: gigaset: fix illegal free on probe errors")
> ed9ed5a89acb ("staging: gigaset: add endpoint-type sanity check")
> from the staging.current tree and commit:
> f10870b05d5e ("staging: remove isdn capi drivers")
> from the staging tree.
> I fixed it up (I just removed the file) 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 knew this would happen :)

greg k-h

 \ /
  Last update: 2019-12-14 13:20    [W:0.025 / U:2.580 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site