linux-kernel - linux-next: manual merge of the sound-asoc tree with the sound 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>] [day] [month] [year] [list]

Message-ID: <20190809131616.629cc15c@canb.auug.org.au>
Date:   Fri, 9 Aug 2019 13:16:16 +1000
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Mark Brown <broonie@...nel.org>,
        Liam Girdwood <lgirdwood@...il.com>,
        Takashi Iwai <tiwai@...e.de>
Cc:     Linux Next Mailing List <linux-next@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Cezary Rojewski <cezary.rojewski@...el.com>
Subject: linux-next: manual merge of the sound-asoc tree with the sound tree

Hi all,

Today's linux-next merge of the sound-asoc tree (yesterday' version)
got a conflict in:

  sound/soc/intel/skylake/skl.c

between commit:

  19abfefd4c76 ("ALSA: hda: Direct MMIO accesses")

from the sound tree and commit:

  bcc2a2dc3ba8 ("ASoC: Intel: Skylake: Merge skl_sst and skl into skl_dev struct")

from the sound-asoc 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 sound/soc/intel/skylake/skl.c
index 239348b0596b,6be25e617c21..000000000000
--- a/sound/soc/intel/skylake/skl.c
+++ b/sound/soc/intel/skylake/skl.c
@@@ -858,10 -854,11 +858,10 @@@ out_err
   * constructor
   */
  static int skl_create(struct pci_dev *pci,
- 		      struct skl **rskl)
 -		      const struct hdac_io_ops *io_ops,
+ 		      struct skl_dev **rskl)
  {
  	struct hdac_ext_bus_ops *ext_ops = NULL;
- 	struct skl *skl;
+ 	struct skl_dev *skl;
  	struct hdac_bus *bus;
  	struct hda_bus *hbus;
  	int err;

Content of type "application/pgp-signature" skipped