Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in:
drivers/gpu/drm/nouveau/nvkm/engine/gr/nv10.c
between commit:
109c2f2f1c42 ("drm/nouveau/gr: switch to subdev printk macros")
from the drm tree and commit:
4bb138a47b7f ("drm/nouveau/gr: Fix typo in nv10.c")
from
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in:
drivers/media/v4l2-core/videobuf2-memops.c
between commit:
6690c8c78c74 ("[media] media: vb2: Remove unused functions")
from the v4l-dvb tree and commit:
e1c05067c323 ("treewide: fix typos in comment blocks")
from
2015-08-10 11:37 GMT+09:00 Stephen Rothwell :
> 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
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
Hi,
On Wed, 3 Dec 2014 15:01:53 +1100 Stephen Rothwell
wrote:
>
> I fixed it up (the pm tree change was a subset of the trivial tree one)
^^
superset
--
Cheers,
Stephen Rothwells...@canb.auug.org.au
pgp0HS_Ewg8R5.pgp
Descripti
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/pci/pci-driver.c between commit 0144fd0c8842 ("PCI / PM: Drop
CONFIG_PM_RUNTIME from the PCI core") from the pm tree and commit
2386dc4fb001 ("PCI: Fix comment typo 'COMFIG_PM_OPS") from the trivial
tree.
I fixed it u
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
block/blk-core.c between commit a492f075450f ("block,scsi: fixup
blk_get_request dead queue scenarios") from the block tree and commit
da3dae54e4ff ("Documentation: Docbook: Fix generated
DocBook/kernel-api.xml") from the triv
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
mm/memcontrol.c between commit 747db954cab6 ("mm: memcontrol: use page
lists for uncharge batching") from Linus' tree and commit cc5ac3e15fa5
("mm: memcontrol: fix comment") from the trivial tree.
I fixed it up (the former re
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
Documentation/devicetree/bindings/arm/omap/omap.txt between commit
38b248db60e3 ("ARM: dts: Add support for DRA72x family of devices")
from the arm-soc tree and commit c98be0c96db0 ("doc: spelling error
changes") from the triv
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
Documentation/devicetree/bindings/arm/omap/omap.txt between commit
11e2191c2a6f ("ARM: dts: am437x-gp-evm: Add gp dts") from the tree and
commit c98be0c96db0 ("doc: spelling error changes") from the trivial tree.
I fixed it
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/gpu/drm/qxl/Kconfig between commit 488574dbc47e ("gpu: fix qxl
missing crc32_le") from Linus' tree and commit 949b6183412c
("drivers/gpu/drm/qxl/Kconfig: reformat the help text") from the trivial
tree.
I fixed it up (
On Wed, 16 Oct 2013, Pablo Neira Ayuso wrote:
> On Wed, Oct 16, 2013 at 11:20:04AM +0200, Jiri Kosina wrote:
> > On Wed, 16 Oct 2013, Jozsef Kadlecsik wrote:
> >
> > > > Today's linux-next merge of the trivial tree got conflicts in
> > > >
> > > > net/netfilter/xt_set.c
> > > >
> > > >
On Wed, Oct 16, 2013 at 11:20:04AM +0200, Jiri Kosina wrote:
> On Wed, 16 Oct 2013, Jozsef Kadlecsik wrote:
>
> > > Today's linux-next merge of the trivial tree got conflicts in
> > >
> > > net/netfilter/xt_set.c
> > >
> > > caused by commits 3f79410 (treewide: Fix common typo in "identify") a
On Wed, 16 Oct 2013, Jozsef Kadlecsik wrote:
> > Today's linux-next merge of the trivial tree got conflicts in
> >
> > net/netfilter/xt_set.c
> >
> > caused by commits 3f79410 (treewide: Fix common typo in "identify") and
> > bd3129f (netfilter: ipset: order matches and targets separatedly i
On Tue, 15 Oct 2013, Thierry Reding wrote:
> Today's linux-next merge of the trivial tree got conflicts in
>
> net/netfilter/xt_set.c
>
> caused by commits 3f79410 (treewide: Fix common typo in "identify") and
> bd3129f (netfilter: ipset: order matches and targets separatedly in
> xt_set.c
Today's linux-next merge of the trivial tree got conflicts in
net/netfilter/xt_set.c
caused by commits 3f79410 (treewide: Fix common typo in "identify") and
bd3129f (netfilter: ipset: order matches and targets separatedly in
xt_set.c).
I fixed them up (see below). Please verify that the
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/net/wireless/iwlwifi/mvm/time-event.c between commit 057397943eee
("iwlwifi: mvm: disconnect if time event scheduling fails") from the
wireless tree and commit 0b1587b18bfe ("treewide: Fix typo in printk")
from the tri
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.c between commit
068a8d197e00 ("qlcnic: Replace poll mode mailbox interface with interrupt
based mailbox interface") from the tree and commit 0b1587b18bfe
("treewide: Fix typo
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/crypto/ux500/hash/hash_core.c between commit 69d2884debaa
("crypto: ux500 - Fix logging, make arrays const, neatening") from the
crypto tree and commit 0b1587b18bfe ("treewide: Fix typo in printk") from
the trivial tre
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
kernel/irq/generic-chip.c between commit ccc414f83914 ("genirq: Add the
generic chip to the genirq docbook") from Linus' tree and commit
37074c5a1b99 ("irq/generic-chip: fix a few kernel-doc entries") from the
trivial tree.
I
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
fs/btrfs/free-space-cache.c between commit 905d0f564e9c ("btrfs: add
prefix to sanity tests messages") from the btrfs tree and commit
8b513d0cf603 ("treewide: Fix typo in printk") from the trivial tree.
I fixed it up (see bel
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/video/omap2/displays/panel-n8x0.c between commit ecc8b3708986
("OMAPDSS: Add panel dev pointer to dssdev") from the fbdev tree and
commit 8b513d0cf603 ("treewide: Fix typo in printk") from the trivial
tree.
I fixed it
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
Documentation/networking/netlink_mmap.txt between commit 3dd17edea018
("doc:networking: Fix typo in documentation/networking") from the
net-next tree and commit f884ab15afdc ("doc: fix misspellings with
'codespell' tool") from
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/arm/kvm/arm.c between commit 3414bbfff98b ("ARM: KVM: move exit
handler selection to a separate file") from the arm tree and commit
b23f7a09f935 ("treewide: Fix typo in printk and comments") from the
trivial tree.
The fo
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
Documentation/virtual/virtio-spec.txt between commit 29266e2e29f1
("Remove Documentation/virtual/virtio-spec.txt") from the virtio tree and
commit d097ddaf529f ("doc: virtual: Fix typos in virtio-spec.txt") from
the trivial tr
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/devfreq/exynos4_bus.c between commit 8fa938acb318 ("PM / devfreq:
exynos4_bus: honor RCU lock usage") from the pm tree and commit
8a168ca7074b ("treewide: Fix typo in various drivers") from the trivial
tree.
I fixed i
Hi Jiri,
On Wed, 23 Jan 2013 14:03:48 +1100 Stephen Rothwell
wrote:
>
> Today's linux-next merge of the trivial tree got a conflict in
> arch/mips/cavium-octeon/executive/cvmx-helper-util.c between commit
> baf783ede9dc ("MIPS: Whitespace cleanup") from the mips tree and commit
> d82603c6da75 ("
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
arch/mips/cavium-octeon/executive/cvmx-helper-util.c between commit
baf783ede9dc ("MIPS: Whitespace cleanup") from the mips tree and commit
d82603c6da75 ("treewide: Replace incomming with incoming in all comments
and strings")
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/regulator/palmas-regulator.c between commit bdc4baacebda
("regulator: palmas: Convert palmas_ops_smps to regulator_[get|
set]_voltage_sel_regmap") from the regulator tree and commit 02582e9bcc36
("treewide: fix typo of
Hi Jiri,
On Tue, Oct 02, 2012 at 12:21:16AM +0200, Jiri Kosina wrote:
> On Wed, 12 Sep 2012, Stephen Rothwell wrote:
>
> > Hi Jiri,
> >
> > Today's linux-next merge of the trivial tree got a conflict in
> > drivers/video/backlight/88pm860x_bl.c between commit a6ccdcd98c39 ("mfd:
> > 88pm860x: Us
On Wed, 12 Sep 2012, Stephen Rothwell wrote:
> Hi Jiri,
>
> Today's linux-next merge of the trivial tree got a conflict in
> drivers/video/backlight/88pm860x_bl.c between commit a6ccdcd98c39 ("mfd:
> 88pm860x: Use REG resource for backlight") from the mfd tree and commit
> e1c9ac420ef1 ("Revert "
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/video/backlight/88pm860x_bl.c between commit a6ccdcd98c39 ("mfd:
88pm860x: Use REG resource for backlight") from the mfd tree and commit
e1c9ac420ef1 ("Revert "backlight: fix memory leak on obscure error
path"") from t
Hi Jiri,
Today's linux-next merge of the trivial tree got a conflict in
drivers/scsi/ipr.c between commit d3dbeef657fd ("powerpc: Rename 64-bit
PVR constants to PVR_foo") from the powerpc tree and commit 203fa3fe9c9d
("ipr: fix small coding style issues") from the trivial tree.
Just context chang
33 matches
Mail list logo
