linux-kernel - linux-next: manual merge of the staging tree with the v4l-dvb tree

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

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:   Thu, 6 Apr 2017 13:34:20 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Greg KH <greg@...ah.com>,
        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>,
        Derek Robson <robsonde@...il.com>, Sean Young <sean@...s.org>
Subject: linux-next: manual merge of the staging tree with the v4l-dvb tree

Hi all,

Today's linux-next merge of the staging tree got conflicts in:

  drivers/staging/media/lirc/lirc_sasem.c
  drivers/staging/media/lirc/lirc_sir.c

between commits:

  e66267161971 ("[media] rc: promote lirc_sir out of staging")
  51bb3fd788cb ("[media] staging: lirc_sasem: remove")

from the v4l-dvb tree and commit:

  87ddb91067b9 ("Staging: media: lirc - style fix")

from the staging tree.

I fixed it up (I removed both files - the updates to lirc_sir.c were
also done in the v4l-dvb tree) 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