* linux-next: please clean up the hid tree
@ 2016-07-12 23:28 Stephen Rothwell
2016-07-13 1:20 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2016-07-12 23:28 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel
Hi Jiri,
The hid tree
(git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next)
seems to be based on v3.19 and constists of a large number of merges
(of stuff that is now in Linus' tree) and ends with one particulary
large revert (of a merge).
Please just rebase it onto (e.g.) v4.7-rc<something>).
$ git shortlog origin/master..hid/for-next
Alexander Kuleshov (1):
HID: debug: Check result of debugfs_create_dir() and debugfs_create_file()
Arnd Bergmann (1):
HID: logitech-hidpp: select CONFIG_POWER_SUPPLY
Benjamin Tissoires (1):
HID: logitech-hidpp: remove HIDPP_QUIRK_CONNECT_EVENTS
Fu, Zhonghui (1):
HID: i2c_hid: enable i2c-hid devices to suspend/resume asynchronously
Guohua Zhong (1):
HID: i2c-hid: set power sleep before shutdown
Heiner Kallweit (11):
HID: migrate USB LED driver from usb misc to hid
usb: misc: remove outdated USB LED driver
HID: thingm: simplify debug output code
HID: hid-led: add support for devices with multiple independent LEDs
HID: hid-led: add support for reading from LED devices
HID: hid-led: add support for ThingM blink(1)
HID: remove ThingM blink(1) driver
HID: hid-led: remove report id from struct hidled_config
HID: hid-led: add support for Delcom Visual Signal Indicator G2
HID: hid-led: add support for Greynut Luxafor
HID: hid-led: fix Delcom support on big endian systems
Jean-Gabriel Gill-Couture (1):
HID: add usb device id for Apple Magic Keyboard
Jiri Kosina (231):
Merge branches 'for-4.1/genius', 'for-4.1/logitech', 'for-4.1/rmi', 'for-4.1/sony' and 'for-4.1/wacom' into for-next
Merge branch 'for-4.1/sensor-hub' into for-next
Merge branch 'for-4.1/upstream' into for-next
Merge branch 'for-4.1/wacom' into for-next
Merge branch 'for-4.1/i2c-hid' into for-next
Merge branch 'for-4.1/rmi' into for-next
Merge branch 'for-4.1/upstream' into for-next
Merge branch 'for-4.1/wacom' into for-next
Merge branch 'for-4.0/upstream-fixes' into for-next
Merge branch 'for-4.1/huion-uclogic-merge' into for-next
Merge branch 'for-4.1/huion-uclogic-merge' into for-next
Merge branch 'for-4.1/upstream' into for-next
Merge branch 'for-4.1/multitouch' into for-next
Merge branch 'for-4.1/wacom' into for-next
Merge branch 'for-4.0/upstream-fixes' into for-next
Merge branch 'for-4.1/wacom' into for-next
Merge branch 'for-4.1/multitouch' into for-next
Merge branch 'for-4.0/upstream-fixes' into for-next
Merge branch 'for-4.1/upstream' into for-next
Merge branch 'for-4.1/huion-uclogic-merge' into for-next
Merge branch 'for-4.1/kconfig-drop-expert-dependency' into for-next
Merge branch 'for-4.1/upstream' into for-next
Merge branch 'for-4.1/upstream' into for-next
Merge branch 'for-4.1/sensor-hub' into for-next
Merge branch 'for-4.1/sensor-hub' into for-next
Merge branch 'for-4.1/wacom' into for-next
Merge branch 'for-4.0/upstream-fixes' into for-next
Merge branch 'for-4.0/upstream-fixes' into for-next
Merge branch 'for-4.1/upstream' into for-next
Merge branch 'for-4.1/wacom' into for-next
Merge branch 'for-4.0/upstream-fixes' into for-next
Merge branch 'for-4.1/logitech' into for-next
Merge branch 'for-4.1/wacom' into for-next
Merge branch 'for-4.1/logitech' into for-next
Merge branch 'for-4.1/upstream' into for-next
Merge branch 'for-4.1/upstream' into for-next
Merge branch 'for-4.1/sensor-hub' into for-next
Merge branch 'for-4.2/wacom' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.2/lenovo' into for-next
Merge branch 'for-4.1/upstream-fixes' into for-next
Merge branch 'for-4.2/wacom' into for-next
Merge branch 'for-4.2/wacom' into for-next
Merge branch 'for-4.2/lenovo' into for-next
Merge branch 'for-4.2/logitech' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.2/sony' into for-next
Merge branch 'for-4.2/sjoy' into for-next
Merge branch 'for-4.1/upstream-fixes' into for-next
Merge branch 'for-4.2/logitech' into for-next
Merge branch 'for-4.1/upstream-fixes' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.1/upstream-fixes' into for-next
Merge branch 'for-4.2/sensor-hub' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.1/upstream-fixes' into for-next
Merge branch 'for-4.2/wacom' into for-next
Merge branch 'for-4.1/upstream-fixes' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.2/logitech' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.2/i2c-hid' into for-next
Merge branch 'for-4.2/sony' into for-next
Merge branch 'for-4.2/plantronics' into for-next
Merge branch 'for-4.2/rmi' into for-next
Merge branch 'for-4.2/wacom' into for-next
Merge branch 'for-4.2/sony' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.2/upstream' into for-next
Merge branch 'for-4.3/picolcd' into for-next
Merge branch 'for-4.2/upstream-fixes' into for-next
Merge branch 'for-4.3/sensor-hub' into for-next
Merge branch 'for-4.3/upstream' into for-next
Merge branch 'for-4.2/upstream-fixes' into for-next
Merge branch 'for-4.2/upstream-fixes' into for-next
Merge branch 'for-4.3/i2c-hid' into for-next
Merge branch 'for-4.3/cp2112' into for-next
Merge branch 'for-4.3/rmi' into for-next
Merge branch 'for-4.3/upstream' into for-next
Merge branch 'for-4.3/cp2112' into for-next
Merge branch 'for-4.3/upstream' into for-next
Merge branch 'for-4.3/rmi' into for-next
Merge branch 'for-4.3/wacom' into for-next
Merge branch 'for-4.3/sony' into for-next
Merge branch 'for-4.3/cp2112' into for-next
Merge branch 'for-4.3/cp2112' into for-next
Merge branch 'for-4.3/wacom' into for-next
Merge branch 'for-4.3/rmi' into for-next
Merge branch 'for-4.3/wacom' into for-next
Merge branch 'for-4.3/microsoft' into for-next
Merge branch 'for-4.3/multitouch' into for-next
Merge branch 'for-4.3/sony' into for-next
Merge branch 'for-4.3/upstream' into for-next
Merge branch 'for-4.2/upstream-fixes' into for-next
Merge branch 'for-4.3/logitech' into for-next
Merge branch 'for-4.3/chicony' into for-next
Merge branch 'for-4.2/upstream-fixes' into for-next
Merge branch 'for-4.3/sony' into for-next
Merge branch 'for-4.3/wacom' into for-next
Revert "HID: core/input: Fix accessing freed memory during driver unbind"
Merge branch 'for-4.2/upstream-fixes-devm-fixed' into for-next
Merge branch 'for-4.3/wacom' into for-next
Merge branch 'for-4.3/upstream' into for-next
Merge branch 'for-4.2/upstream-fixes-devm-fixed' into for-next
Merge branch 'for-4.3/wacom' into for-next
Merge branch 'for-4.3/lenovo' into for-next
Merge branch 'for-4.3/gembird' into for-next
Merge branch 'for-4.3/wacom' into for-next
Merge branch 'for-4.3/i2c-hid' into for-next
Merge branch 'for-4.3/upstream' into for-next
Merge branch 'for-4.3/upstream' into for-next
Merge branch 'for-4.3/wacom' into for-next
Merge branch 'for-4.3/upstream-fixes' into for-next
Merge branches 'for-4.4/debugfs-fixes', 'for-4.4/dragonrise', 'for-4.4/logitech' and 'for-4.4/upstream' into for-next
Merge branch 'for-4.4/microsoft' into for-next
Merge branch 'for-4.4/upstream' into for-next
Merge branch 'for-4.3/upstream-fixes' into for-next
Merge branch 'for-4.4/wacom' into for-next
Merge branch 'for-4.4/i2c-hid' into for-next
Revert "HID: debug: Check result of debugfs_create_dir() and debugfs_create_file()"
Merge branch 'for-4.4/multitouch' into for-next
Merge branch 'for-4.4/upstream' into for-next
Merge branch 'for-4.4/corsair' into for-next
Merge branch 'for-4.3/upstream-fixes' into for-next
Merge branch 'for-4.3/upstream-fixes' into for-next
Merge branch 'for-4.4/multitouch' into for-next
Merge branch 'for-4.4/wacom' into for-next
Merge branch 'for-4.4/roccat-sysfs-deprecation' into for-next
Merge branch 'for-4.3/upstream-fixes' into for-next
Merge branch 'for-4.4/upstream' into for-next
Merge branch 'for-4.4/wacom' into for-next
Merge branch 'for-4.4/wacom' into for-next
Merge branch 'for-4.4/wacom' into for-next
Merge branch 'for-4.4/logitech' into for-next
Merge branch 'for-4.4/upstream-fixes' into for-next
Merge branch 'for-4.4/upstream-fixes' into for-next
Merge branch 'for-4.5/sony' into for-next
Merge branch 'for-4.5/sony' into for-next
Merge branch 'for-4.5/i2c-hid' into for-next
Merge branch 'for-4.5/wacom' into for-next
Merge branch 'for-4.5/core' into for-next
Merge branch 'for-4.5/core' into for-next
Merge branch 'for-4.4/upstream-fixes' into for-next
Merge branch 'for-4.5/logitech' into for-next
Merge branch 'for-4.5/core' into for-next
Merge branch 'for-4.5/core' into for-next
Merge branch 'for-4.5/multitouch' into for-next
Merge branch 'for-4.5/core' into for-next
Merge branch 'for-4.5/core' into for-next
Merge branch 'for-4.4/upstream-fixes' into for-next
Merge branch 'for-4.5/multitouch' into for-next
Merge branch 'for-4.5/wacom' into for-next
Merge branch 'for-4.5/async-suspend' into for-next
Merge branch 'for-4.5/wacom' into for-next
Merge branch 'for-4.5/wacom' into for-next
Merge branch 'for-4.5/core' into for-next
Merge branch 'for-4.5/upstream' into for-next
Merge branch 'for-4.5/upstream' into for-next
Merge branch 'for-4.5/container-of-cleanups' into for-next
Merge branch 'for-4.4/upstream-fixes' into for-next
Merge branch 'for-4.5/wacom' into for-next
Merge branch 'for-4.4/upstream-fixes' into for-next
Merge branch 'for-4.4/upstream-fixes' into for-next
Merge branch 'for-4.5/logitech' into for-next
Merge branch 'for-4.5/upstream-fixes' into for-next
Merge branch 'for-4.5/upstream-fixes' into for-next
Merge branch 'for-4.6/upstream' into for-next
Merge branch 'for-4.6/sony' into for-next
Merge branch 'for-4.6/wacom' into for-next
Merge branch 'for-4.5/upstream-fixes' into for-next
Merge branch 'for-4.6/logitech' into for-next
Merge branch 'for-4.5/upstream-fixes' into for-next
Merge branch 'for-4.6/upstream' into for-next
Merge branch 'for-4.6/upstream' into for-next
Merge branches 'for-4.6/sony' and 'for-4.6/upstream' into for-next
Merge branch 'for-4.5/upstream-fixes' into for-next
Merge branch 'for-4.5/upstream-fixes' into for-next
Merge branch 'for-4.6/wacom' into for-next
Merge branch 'for-4.5/upstream-fixes' into for-next
Merge branch 'for-4.6/thingm' into for-next
Merge branch 'for-4.6/cmedia' into for-next
Merge branch 'for-4.6/multitouch' into for-next
Merge branch 'for-4.6/i2c-hid' into for-next
Merge branch 'for-4.6/penmount' into for-next
Merge branch 'for-4.5/upstream-fixes' into for-next
Merge branch 'for-4.6/multitouch' into for-next
Merge branch 'for-4.6/i2c-hid' into for-next
Merge branch 'for-4.6/thingm' into for-next
Merge branch 'for-4.6/upstream' into for-next
Merge branch 'for-4.6/upstream-fixes' into for-next
Merge branches 'for-4.6/upstream-fixes' and 'for-4.7/hidraw' into for-next
Merge branch 'for-4.6/upstream-fixes' into for-next
Merge branch 'for-4.7/asus' into for-next
Merge branch 'for-4.7/upstream' into for-next
Merge branch 'for-4.7/asus' into for-next
Merge branch 'for-4.6/upstream-fixes' into for-next
Merge branch 'for-4.6/upstream-fixes' into for-next
Merge branch 'for-4.7/upstream' into for-next
Merge branch 'for-4.6/upstream-fixes' into for-next
Merge branch 'for-4.7/thingm' into for-next
Merge branch 'for-4.7/thingm' into for-next
Merge branch 'for-4.6/upstream-fixes' into for-next
Merge branch 'for-4.7/upstream' into for-next
Merge branch 'for-4.6/upstream-fixes' into for-next
Merge branch 'for-4.7/upstream-fixes' into for-next
Merge branch 'for-4.7/upstream-fixes' into for-next
Merge branch 'for-4.8/uhid-offload-hid-device-add' into for-next
Merge branch 'for-4.8/i2c-hid' into for-next
HID: led: fix config
Merge branch 'for-4.8/hid-led' into for-next
HID: alps: struct u1_dev *priv is internal to the driver
Merge branch 'for-4.8/alps' into for-next
HID: alps: pass correct sizes to hid_hw_raw_request()
Merge branch 'for-4.8/alps' into for-next
Merge branch 'for-4.8/upstream' into for-next
HID: alps: match alps devices in core
Merge branch 'for-4.8/alps' into for-next
Merge branch 'for-4.8/i2c-hid' into for-next
Merge branch 'for-4.8/merge-thingm-into-hid-led' into for-next
Merge branch 'for-4.8/alps' into for-next
Merge branch 'for-4.7/upstream-fixes' into for-next
Merge branch 'for-4.7/upstream-fixes' into for-next
Merge branch 'for-4.8/hid-led' into for-next
Merge branch 'for-4.8/logitech-hidpp-battery' into for-next
Merge branch 'for-4.8/hid-led' into for-next
Merge branch 'for-4.8/apple' into for-next
Merge branch 'for-4.8/logitech-hidpp-battery' into for-next
Revert "Merge branch 'for-4.8/logitech-hidpp-battery' into for-next"
Revert "Merge branch 'for-4.8/logitech-hidpp-battery' into for-next"
Krzysztof Kozlowski (1):
HID: core/input: Fix accessing freed memory during driver unbind
Masaki Ota (2):
HID: add Alps I2C HID Touchpad-Stick support
HID: alps: a few cleanups
Peter Hutterer (1):
HID: logitech-hidpp: add battery support for HID++ 2.0 devices
Roderick Colenbrander (1):
HID: uhid: fix timeout when probe races with IO
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: linux-next: please clean up the hid tree
2016-07-12 23:28 linux-next: please clean up the hid tree Stephen Rothwell
@ 2016-07-13 1:20 ` Stephen Rothwell
2016-07-13 9:21 ` Jiri Kosina
0 siblings, 1 reply; 4+ messages in thread
From: Stephen Rothwell @ 2016-07-13 1:20 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel
Hi Jiri,
On Wed, 13 Jul 2016 09:28:09 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> The hid tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next)
> seems to be based on v3.19 and constists of a large number of merges
> (of stuff that is now in Linus' tree) and ends with one particulary
> large revert (of a merge).
What I forgot to say is that that last revert creates lots of conflicts
when I merge your tree:
CONFLICT (content): Merge conflict in sound/pci/hda/patch_realtek.c
CONFLICT (content): Merge conflict in mm/shmem.c
CONFLICT (content): Merge conflict in fs/dcache.c
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap-smp.c
CONFLICT (content): Merge conflict in Makefile
So I have just dropped the hid tree until it is cleaned up.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: please clean up the hid tree
2016-07-13 1:20 ` Stephen Rothwell
@ 2016-07-13 9:21 ` Jiri Kosina
2016-07-13 15:24 ` Stephen Rothwell
0 siblings, 1 reply; 4+ messages in thread
From: Jiri Kosina @ 2016-07-13 9:21 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-next, linux-kernel
On Wed, 13 Jul 2016, Stephen Rothwell wrote:
> Hi Jiri,
>
> The hid tree
> (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next)
> seems to be based on v3.19 and constists of a large number of merges
> (of stuff that is now in Linus' tree) and ends with one particulary
> large revert (of a merge).
Hi Stephen,
I try to keep the tree completely non-rebasing, as people are actually
using it for development. But for-next is a bit special in this respect,
and if there is a branch that could potentially be considered for
ocasional rebasing, it's probably for-next one.
OTOH, what issues exactly are the extra merges causing for you please?
On Wed, 13 Jul 2016, Stephen Rothwell wrote:
> On Wed, 13 Jul 2016 09:28:09 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > The hid tree
> > (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next)
> > seems to be based on v3.19 and constists of a large number of merges
> > (of stuff that is now in Linus' tree) and ends with one particulary
> > large revert (of a merge).
>
> What I forgot to say is that that last revert creates lots of conflicts
> when I merge your tree:
>
> CONFLICT (content): Merge conflict in sound/pci/hda/patch_realtek.c
> CONFLICT (content): Merge conflict in mm/shmem.c
> CONFLICT (content): Merge conflict in fs/dcache.c
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/inc/smu74_discrete.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.h
> CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c
> CONFLICT (content): Merge conflict in arch/powerpc/Kconfig
> CONFLICT (content): Merge conflict in arch/arm/mach-omap2/omap-smp.c
> CONFLICT (content): Merge conflict in Makefile
>
> So I have just dropped the hid tree until it is cleaned up.
Ok, this is pretty odd. I'll look into what happened, it'll be resolved in
a couple minutes, so please start pulling for-next again.
Thanks,
--
Jiri Kosina
SUSE Labs
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: linux-next: please clean up the hid tree
2016-07-13 9:21 ` Jiri Kosina
@ 2016-07-13 15:24 ` Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2016-07-13 15:24 UTC (permalink / raw)
To: Jiri Kosina; +Cc: linux-next, linux-kernel
Hi Jiri,
On Wed, 13 Jul 2016 11:21:36 +0200 (CEST) Jiri Kosina <jikos@kernel.org> wrote:
>
> On Wed, 13 Jul 2016, Stephen Rothwell wrote:
>
> > The hid tree
> > (git://git.kernel.org/pub/scm/linux/kernel/git/jikos/hid.git#for-next)
> > seems to be based on v3.19 and constists of a large number of merges
> > (of stuff that is now in Linus' tree) and ends with one particulary
> > large revert (of a merge).
>
> I try to keep the tree completely non-rebasing, as people are actually
> using it for development. But for-next is a bit special in this respect,
> and if there is a branch that could potentially be considered for
> ocasional rebasing, it's probably for-next one.
The non-rebasing bit is good if your branch is exactly what goes
upstream because if (after it is merged by upstream) you do a back
merge of upstream, that merge will just fast forward your branch and
your tree will be empty - all with no rebasing. In the case of your
for-next branch, that is not what is happening.
> OTOH, what issues exactly are the extra merges causing for you please?
Well, if you have a look at the diffstat of the last revert of a merge,
you get this:
$ git diff --stat hid/for-next^..hid/for-next
.mailmap | 4 -
Documentation/ABI/testing/configfs-usb-gadget-uvc | 58 ++---
.../ABI/testing/sysfs-bus-iio-proximity-as3935 | 2 +-
Documentation/scsi/scsi_eh.txt | 8 +-
MAINTAINERS | 13 +-
Makefile | 4 +-
arch/Kconfig | 7 +-
arch/alpha/include/asm/pgalloc.h | 4 +-
.
. Lots elided
.
sound/hda/hdac_regmap.c | 4 +-
sound/pci/hda/hda_tegra.c | 20 +-
sound/pci/hda/patch_realtek.c | 6 -
.../ftrace/test.d/trigger/trigger-hist-mod.tc | 9 +-
.../ftrace/test.d/trigger/trigger-hist.tc | 9 +-
.../ftrace/test.d/trigger/trigger-multihist.tc | 9 +-
tools/testing/selftests/vm/compaction_test.c | 2 +-
tools/vm/slabinfo.c | 2 +-
404 files changed, 2141 insertions(+), 3636 deletions(-)
So that git sees that you have this enormous change in your tree ...
Also, the more merges your tree contains and the further back it is
branched, the harder git has to work to do the merge against the other
trees I have and Linus' tree.
> Ok, this is pretty odd. I'll look into what happened, it'll be resolved in
> a couple minutes, so please start pulling for-next again.
See above.
Anyway, thanks for the cleanup, the tree looks much better now.
--
Cheers,
Stephen Rothwell
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-07-13 15:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-07-12 23:28 linux-next: please clean up the hid tree Stephen Rothwell
2016-07-13 1:20 ` Stephen Rothwell
2016-07-13 9:21 ` Jiri Kosina
2016-07-13 15:24 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).