Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1203750

linux-next: manual merge of the trivial tree with the regulator tree

Show all headers | View raw

Hi Jiri,

Today's linux-next merge of the trivial tree got a conflict in:

  drivers/regulator/max77843.c

between commit:

  2a32b401a11f ("regulator: Remove the max77843 driver")

from the regulator tree and commit:

  971bd8fa369a ("treewide: Fix typo in printk")

from the trivial tree.

I fixed it up (the former removed the file, so I did that) and can carry
the fix as necessary (no action is required).

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

linux-next: manual merge of the trivial tree with the regulator  tree Stephen Rothwell <sfr@canb.auug.org.au> - 2015-08-10 04:40 +0200
  Re: linux-next: manual merge of the trivial tree with the regulator tree Krzysztof Kozłowski <k.kozlowski.k@gmail.com> - 2015-08-10 06:10 +0200

csiph-web