Skip to contentSkip to conversation

platform-drivers-x86 for 4.2-1

GIT PULL Darren Hart 3 participants 4 messages Jun 30, 2015 – Jul 3, 2015

lore
Share & tools
lore
#0 lore raw

Resend after gmail rejected my script's non RFC 2822 compliant message. Linus, I don't know what has changed, but gmail is rejecting my previously acceptable mail to you, while vger continues to accept. I'm attempting to resolve it through my own gmail account, but in the meantime, the message sent from mutt directly was accepted by my gmail account - I hope this makes it through your gmail message validators as well. To everyone else - sorry for the noise.

Hi Linus,

Fairly routine update for platform-drivers-x86. Mostly fixes and cleanups, with a significant refactoring of toshiba* drivers. Includes the addition of the dell-rbtn driver.

Thanks,

Darren Hart
Intel Open Source Technology Center

The following changes since commit b787f68c36d49bb1d9236f403813641efa74a031:

Linux 4.1-rc1 (2015-04-26 17:59:10 -0700)

are available in the git repository at:

git://git.infradead.org/users/dvhart/linux-platform-drivers-x86.git tags/platform-drivers-x86-v4.2-1

for you to fetch changes up to 5ee7041e5bc0fe8ba04a554dc2f9a18f709bc005:

MAINTAINERS: Orphan x86 driver msi-wmi (2015-06-15 13:39:35 -0700)

----------------------------------------------------------------
platform-drivers-x86 got 4.2

asus-wmi: Fan control
dell*: Add Dell airplane mode switch driver
ideapad-laptop: Platform rfkill fixes, and regression fix
pvpanic: Handle missing _STA correctly
toshiba*: Rafactor bluetooth support, haps documentation, driver cleanup
other: Use acpi_video_unregister_backlight instead of acpi_video_unregister in
serveral drivers.
Orphan msi-wmi.

----------------------------------------------------------------
Anisse Astier (1):
MAINTAINERS: Orphan x86 driver msi-wmi

Arnd Bergmann (1):
ideapad: fix software rfkill setting

Azael Avalos (13):
toshiba_acpi: Remove bluetooth rfkill code
toshiba_bluetooth: Add a container struct named toshiba_bluetooth_dev
toshiba_bluetooth: Add RFKill handler functions
toshiba_bluetooth: Adapt *_enable, *_notify and *_resume functions to rfkill
toshiba_bluetooth: Change BT status message to debug
toshiba_acpi: Remove no longer needed hci_{read, write}2 functions
toshiba_acpi: Rename hci_{read, write}1 functions
toshiba_acpi: Comments cleanup
toshiba_acpi: Remove TOS_FAILURE check from some functions
toshiba_acpi: Bump driver version to 0.22
toshiba_haps: Replace sscanf with kstrtoint
toshiba_haps: Make use of DEVICE_ATTR_{RW, WO} macros Documentation/ABI: Add file describing the sysfs entries for toshiba_haps

Dmitry Tunin (1):
ideapad_laptop: Lenovo G50-30 fix rfkill reports wireless blocked

Hans de Goede (3):
apple_gmux: Use acpi_video_unregister_backlight instead of acpi_video_unregister
asus-wmi: Use acpi_video_unregister_backlight instead of acpi_video_unregister
samsung-laptop: Use acpi_video_unregister_backlight instead of acpi_video_unregister

Kast Bernd (1):
asus-wmi: add fan control

Pali Rohár (3):
dell-rbtn: Dell Airplane Mode Switch driver
dell-rbtn: Export notifier for other kernel modules
dell-laptop: Use dell-rbtn instead i8042 filter when possible

Radim Krčmář (1):
pvpanic: handle missing _STA correctly

 .../ABI/testing/sysfs-driver-toshiba_haps          |  20 +
 MAINTAINERS                                        |   8 +-
 drivers/platform/x86/Kconfig                       |  18 +-
 drivers/platform/x86/Makefile                      |   1 +
 drivers/platform/x86/apple-gmux.c                  |   2 +-
 drivers/platform/x86/asus-wmi.c                    | 346 +++++++++++++++--
 drivers/platform/x86/dell-laptop.c                 |  94 ++++-
 drivers/platform/x86/dell-rbtn.c                   | 423 +++++++++++++++++++++
 drivers/platform/x86/dell-rbtn.h                   |  24 ++
 drivers/platform/x86/ideapad-laptop.c              |  10 +-
 drivers/platform/x86/pvpanic.c                     |  10 +-
 drivers/platform/x86/samsung-laptop.c              |   4 +-
 drivers/platform/x86/toshiba_acpi.c                | 246 +++---------
 drivers/platform/x86/toshiba_bluetooth.c           | 174 +++++++--
 drivers/platform/x86/toshiba_haps.c                |  32 +-
 15 files changed, 1122 insertions(+), 290 deletions(-)
 create mode 100644 Documentation/ABI/testing/sysfs-driver-toshiba_haps
 create mode 100644 drivers/platform/x86/dell-rbtn.c
 create mode 100644 drivers/platform/x86/dell-rbtn.h
Signature · 2 lines
Darren Hart
Intel Open Source Technology Center
#1 lore raw
Quoted 3 lines · Darren Hart

other: Use acpi_video_unregister_backlight instead of acpi_video_unregister in
serveral drivers.

This was very annoying.

Why? There were several pointless conflicts, because you and Rafael both applied some of the same patches from Hans de Goede, and then Rafael had further cleanups (also from Hans) on top of that, so as a result you have both sides doing changes, but not agreeing on just what the changes are. End result: conflict.

The conflicts weren't hard to handle, since generally it was trivial to see that "ok, I had already gotten that change and then some" and just pick Rafael's side. But it's annoying because it shows that you guys are stepping on each others toes, and clearly it's not clear who maintains what.

And you guys had clearly both been on the same mail thread, because Rafael had you as acking the changes that you had then also committed in your own tree. Please talk to each other so that you know who takes what, and we don't have this kind of unnecessary duplication and subsequent extra work.

A few duplicate commits aren't the end of the world, so it's not like this is a serious problem, but it's an annoyance.

Linus

#2 lore raw
Quoted 19 lines · Linus Torvalds
Quoted 3 lines · Darren Hart

other: Use acpi_video_unregister_backlight instead of acpi_video_unregister in
serveral drivers.

This was very annoying.

Why? There were several pointless conflicts, because you and Rafael both applied some of the same patches from Hans de Goede, and then Rafael had further cleanups (also from Hans) on top of that, so as a result you have both sides doing changes, but not agreeing on just what the changes are. End result: conflict.

The conflicts weren't hard to handle, since generally it was trivial to see that "ok, I had already gotten that change and then some" and just pick Rafael's side. But it's annoying because it shows that you guys are stepping on each others toes, and clearly it's not clear who maintains what.

Quoted 8 lines

And you guys had clearly both been on the same mail thread, because Rafael had you as acking the changes that you had then also committed in your own tree. Please talk to each other so that you know who takes what, and we don't have this kind of unnecessary duplication and subsequent extra work.

A few duplicate commits aren't the end of the world, so it's not like this is a serious problem, but it's an annoyance.

Sorry about that, we'll coordinate better next time.

Rafael

#3 lore raw
Quoted 6 lines · Rafael Wysocki
Quoted 5 lines · Linus Torvalds
Quoted 3 lines · Darren Hart

other: Use acpi_video_unregister_backlight instead of acpi_video_unregister in
serveral drivers.

Quoted 7 lines
Quoted 7 lines

This was very annoying.

Why? There were several pointless conflicts, because you and Rafael both applied some of the same patches from Hans de Goede, and then Rafael had further cleanups (also from Hans) on top of that, so as a result you have both sides doing changes, but not agreeing on just what the changes are. End result: conflict.

Ugh! When it rains it pours, I made a mess of this pull request.

Quoted 8 lines
Quoted 8 lines

The conflicts weren't hard to handle, since generally it was trivial to see that "ok, I had already gotten that change and then some" and just pick Rafael's side. But it's annoying because it shows that you guys are stepping on each others toes, and clearly it's not clear who maintains what.

And you guys had clearly both been on the same mail thread, because

Unfortunately, the first 3 preparatory patches were contained within platform/drivers/x86, so I picked them up. They arrived well before the broader set of changes which Rafael naturally picked up.

Quoted 4 lines
Quoted 4 lines

Rafael had you as acking the changes that you had then also committed in your own tree. Please talk to each other so that you know who takes what, and we don't have this kind of unnecessary duplication and subsequent extra work.

I thought I just failed to remove them, but as it turns out... it's worse than that. Michael Ellerman noticed this and reported it, noting he had fixed it up in next and no action was required. As I have been trying to not rebase my next branch per the discussion at Kernel Summit, I interpretted that to mean the fixup was simple enough, and it was better than rebasing the next tree.

(So that's the answer to "Why?" above)

That was foolish in retrospect... how embarrassing.

Quoted 4 lines
Quoted 2 lines

A few duplicate commits aren't the end of the world, so it's not like this is a serious problem, but it's an annoyance.

Sorry about that, we'll coordinate better next time.

Apologies for the annoyance. I will be more cognisant of this in the future, and less hesitant to rebase my next branch to avoid such things landing on your plate.

Sorry for dragging you through the mud with me Rafael :-/

Signature · 2 lines
Darren Hart
Intel Open Source Technology Center