* [PULL REQUEST] i2c for 4.11
@ 2017-03-10 12:33 Wolfram Sang
2017-03-10 18:12 ` Linus Torvalds
0 siblings, 1 reply; 5+ messages in thread
From: Wolfram Sang @ 2017-03-10 12:33 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 2991 bytes --]
Linus,
here are some driver bugfixes from I2C. Unusual this time are the two
reverts. One because I accidently picked a patch from the list which I
should have pulled from my co-maintainer instead ("missing
of_node_put"). And one which I wrongly assumed to be an easy fix but it
turned out already that it needs more iterations ("copy device
properties").
Please pull.
Thanks,
Wolfram
The following changes since commit c1ae3cfa0e89fa1a7ecc4c99031f5e9ae99d9201:
Linux 4.11-rc1 (2017-03-05 12:59:56 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/for-current
for you to fetch changes up to 806dbb20efde821910b5f747befed794077a9109:
Revert "i2c: copy device properties when using i2c_register_board_info()" (2017-03-09 16:41:48 +0100)
----------------------------------------------------------------
Chris Brandt (1):
i2c: riic: fix restart condition
Dmitry Torokhov (1):
i2c: copy device properties when using i2c_register_board_info()
Heiner Kallweit (1):
i2c: meson: fix wrong variable usage in meson_i2c_put_data
Jaedon Shin (1):
i2c: brcmstb: Fix START and STOP conditions
Javier Martinez Canillas (1):
i2c: exynos5: Avoid transaction timeouts due TRANSFER_DONE_AUTO not set
Qi Hou (2):
i2c: add missing of_node_put in i2c_mux_del_adapters
i2c: add missing of_node_put in i2c_mux_del_adapters
Wolfram Sang (4):
i2c: m65xx: drop superfluous quirk structure
Revert "i2c: add missing of_node_put in i2c_mux_del_adapters"
Merge branch 'i2c-mux/for-current' of https://github.com/peda-r/i2c-mux into i2c/for-current
Revert "i2c: copy device properties when using i2c_register_board_info()"
Zhangfei Gao (1):
i2c: designware: add reset interface
with much appreciated quality assurance from
----------------------------------------------------------------
Andrzej Hajda (1):
(Rev.) i2c: exynos5: Avoid transaction timeouts due TRANSFER_DONE_AUTO not set
Andy Shevchenko (1):
(Rev.) i2c: designware: add reset interface
Jun Gao (1):
(Test) i2c: m65xx: drop superfluous quirk structure
Ramiro Oliveira (1):
(Test) i2c: designware: add reset interface
Simon Horman (1):
(Test) i2c: riic: fix restart condition
Zhang Xiao (2):
(Rev.) i2c: add missing of_node_put in i2c_mux_del_adapters
(Rev.) i2c: add missing of_node_put in i2c_mux_del_adapters
drivers/i2c/busses/i2c-brcmstb.c | 27 +++++++++++++++++++++------
drivers/i2c/busses/i2c-designware-core.h | 1 +
drivers/i2c/busses/i2c-designware-platdrv.c | 28 ++++++++++++++++++++++++----
drivers/i2c/busses/i2c-exynos5.c | 3 ++-
drivers/i2c/busses/i2c-meson.c | 2 +-
drivers/i2c/busses/i2c-mt65xx.c | 9 ---------
drivers/i2c/busses/i2c-riic.c | 6 +++++-
drivers/i2c/i2c-mux.c | 2 ++
8 files changed, 56 insertions(+), 22 deletions(-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PULL REQUEST] i2c for 4.11
2017-03-10 12:33 [PULL REQUEST] i2c for 4.11 Wolfram Sang
@ 2017-03-10 18:12 ` Linus Torvalds
2017-03-11 15:59 ` Wolfram Sang
0 siblings, 1 reply; 5+ messages in thread
From: Linus Torvalds @ 2017-03-10 18:12 UTC (permalink / raw)
To: Wolfram Sang, Peter Rosin; +Cc: linux-i2c, Linux Kernel Mailing List
On Fri, Mar 10, 2017 at 4:33 AM, Wolfram Sang <wsa@the-dreams.de> wrote:
>
> here are some driver bugfixes from I2C. Unusual this time are the two
> reverts. One because I accidently picked a patch from the list which I
> should have pulled from my co-maintainer instead ("missing
> of_node_put"). And one which I wrongly assumed to be an easy fix but it
> turned out already that it needs more iterations ("copy device
> properties").
That first revert looks *entirely* pointless.
You added an extra revert, only to pull in the *exact* same patch. WTF?
Even if you wanted to pull that just to sync with somebody elses tree,
why do the revert? It would have merged fine. You can literally see in
the patches that the files had the exact same content, because the
"index" line ends up being the git ID of the blob.
So all I see is "completely and utterly unnecessary mess in the last 24 hours"
Please stop this kind of stupidity. Now I have that unnecessary revert
with a misleading commit log in my tree, in addition to that stupid
merge that has no explanation and just reinstates the exact same thing
you reverted.
And talking about that merge I will repeat this one more time: merges
are commits too. You had damn well add explanations for what a merge
merges and why it is done.
Because this doesn't explain anything:
Merge branch 'i2c-mux/for-current' of
https://github.com/peda-r/i2c-mux into i2c/for-current
So either look at my merge messages and try to emulate that "what does
this merge do" model, or just don't do merges.
If you cannot explain a reason for a merge or be bothered to try to
write a commit message, you shouldn't be doing that merge. It really
is that simple.
Particularly don't do merges when they turn a single commit into
*four* commit (original, revert, merge, and alternate) and have bad
explanations for half of those.
So what you could have done is:
- don't do the pull at all
- if you want to do the pull to sync up or something, don't do the
revert, but instead make the merge message talk about *why* that merge
was done.
Since the *only* possible reason for that pull seems to have been to
make some git history match up, it damn well matters what the git
history is, and these commits should make sense. As it is, the history
just looks messy with bogus explanations.
Linus
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PULL REQUEST] i2c for 4.11
2017-03-10 18:12 ` Linus Torvalds
@ 2017-03-11 15:59 ` Wolfram Sang
0 siblings, 0 replies; 5+ messages in thread
From: Wolfram Sang @ 2017-03-11 15:59 UTC (permalink / raw)
To: Linus Torvalds; +Cc: Peter Rosin, linux-i2c, Linux Kernel Mailing List
[-- Attachment #1: Type: text/plain, Size: 994 bytes --]
Linus,
> You added an extra revert, only to pull in the *exact* same patch. WTF?
The patch I reverted had a broken, typoed Signed-off. My rationale was
to have only a proper one, and not two different ones coming from
different trees. Looks like I misjudged, sorry.
> Please stop this kind of stupidity. Now I have that unnecessary revert
> with a misleading commit log in my tree, in addition to that stupid
> merge that has no explanation and just reinstates the exact same thing
> you reverted.
I see your point.
> And talking about that merge I will repeat this one more time: merges
> are commits too. You had damn well add explanations for what a merge
> merges and why it is done.
Understood. Peter joined as co-maintainer kind of recently, and I guess
it shows that I didn't have to pass on merges a lot so far. It is not
that I ignored your preferences for merges (which make total sense to
me), I just missed to check how to properly do it. Will improve!
Regards,
Wolfram
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL REQUEST] i2c for 4.11
@ 2017-03-31 21:09 Wolfram Sang
0 siblings, 0 replies; 5+ messages in thread
From: Wolfram Sang @ 2017-03-31 21:09 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 1115 bytes --]
Linus,
here are two bugfixes from I2C, specifically the I2C mux section. Thanks
to peda for collecting them. I hope you are happy now with my merge
commit message.
Thanks,
Wolfram
The following changes since commit 97da3854c526d3a6ee05c849c96e48d21527606c:
Linux 4.11-rc3 (2017-03-19 19:09:39 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/for-current
for you to fetch changes up to 0bf9e1270b56b2376ba3b16d951cd0ed7c573f54:
Merge branch 'i2c-mux/for-current' of https://github.com/peda-r/i2c-mux into i2c/for-current (2017-03-30 16:53:48 +0200)
----------------------------------------------------------------
Andy Shevchenko (1):
Revert "i2c: mux: pca954x: Add ACPI support for pca954x"
Mike Looijmans (1):
i2c: mux: pca954x: Add missing pca9546 definition to chip_desc
Wolfram Sang (1):
Merge branch 'i2c-mux/for-current' of https://github.com/peda-r/i2c-mux into i2c/for-current
drivers/i2c/muxes/i2c-mux-pca954x.c | 34 ++++++----------------------------
1 file changed, 6 insertions(+), 28 deletions(-)
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PULL REQUEST] i2c for 4.11
@ 2017-02-24 21:50 Wolfram Sang
0 siblings, 0 replies; 5+ messages in thread
From: Wolfram Sang @ 2017-02-24 21:50 UTC (permalink / raw)
To: Linus Torvalds; +Cc: linux-i2c, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 6752 bytes --]
Linus,
I2C has for you two new drivers (Tegra BPMP and STM32F4), interrupt
support for pca954x muxes, and a bunch of driver bugfixes and
improvements. Nothing really special this cycle.
A few commits have been added to my tree just recently. Those are the
Tegra BPMP driver and a few straightforward bugfixes or cleanups which I
prefer to have upstream rather soonish. The rest had proper linux-next
exposure.
Please pull.
Thanks,
Wolfram
The following changes since commit 7a308bb3016f57e5be11a677d15b821536419d36:
Linux 4.10-rc5 (2017-01-22 12:54:15 -0800)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/for-4.11
for you to fetch changes up to 4c21541d8da17fbe94ecadbfc913d6dff3be7ca2:
i2c: thunderx: Replace pci_enable_msix() (2017-02-23 13:03:56 +0100)
----------------------------------------------------------------
Alexandre Belloni (1):
i2c: at91: ensure state is restored after suspending
Andrzej Hajda (2):
i2c: exynos5: disable fifo-almost-empty irq signal when necessary
i2c: exynos5: fix arbitration lost handling
Ben Gardner (1):
misc: eeprom: at24: use device_property_*() functions instead of of_get_property()
Bhumika Goyal (2):
i2c: omap: constify dev_pm_ops structures
i2c: busses: constify i2c_algorithm structures
Chris Brandt (1):
i2c: riic: correctly finish transfers
Grzegorz Jaszczyk (1):
i2c: mv64xxx: add suspend/resume support
Guenter Roeck (1):
i2c: i2c-cros-ec-tunnel: Reduce logging noise
Jan Glauber (1):
i2c: thunderx: Replace pci_enable_msix()
Javier Martinez Canillas (2):
i2c: mux: pca954x: Export OF device ID table as module aliases
i2c: mux: pca9541: Export OF device ID table as module aliases
Luis Oliveira (1):
i2c: core: helper function to detect slave mode
M'boumba Cedric Madianga (2):
dt-bindings: Document the STM32 I2C bindings
i2c: stm32f4: add driver
Mika Westerberg (1):
i2c: i801: Add support for Intel Gemini Lake
Peter Rosin (1):
i2c: i2c-mux-gpio: rename i2c-gpio-mux to i2c-mux-gpio
Phil Reid (3):
i2c: mux: pca954x: Add missing pca9542 definition to chip_desc
dt: bindings: i2c-mux-pca954x: Add documentation for interrupt controller
i2c: mux: pca954x: Add interrupt controller support
Shardar Shariff Md (1):
i2c: Add Tegra BPMP I2C proxy driver
Simon Horman (1):
i2c: sh_mobile: document support for r8a7796 (R-Car M3-W)
Stefan Wahren (1):
i2c: bcm2835: Avoid possible NULL ptr dereference
Stephen Warren (1):
dt-bindings: Add Tegra186 BPMP I2C binding
Wei Yongjun (1):
i2c: mux: mlxcpld: remove unused including <linux/version.h>
Wolfram Sang (1):
Merge branch 'i2c-mux/for-next' of https://github.com/peda-r/i2c-mux into i2c/for-4.11
with much appreciated quality assurance from
----------------------------------------------------------------
Andi Shyti (4):
(Test) i2c: exynos5: fix arbitration lost handling
(Rev.) i2c: exynos5: fix arbitration lost handling
(Test) i2c: exynos5: disable fifo-almost-empty irq signal when necessary
(Rev.) i2c: exynos5: disable fifo-almost-empty irq signal when necessary
Andy Shevchenko (2):
(Rev.) misc: eeprom: at24: use device_property_*() functions instead of of_get_property()
(Rev.) i2c: core: helper function to detect slave mode
Douglas Anderson (1):
(Rev.) i2c: i2c-cros-ec-tunnel: Reduce logging noise
Jean Delvare (1):
(Rev.) i2c: busses: constify i2c_algorithm structures
Lior Amsalem (2):
(Rev.) i2c: mv64xxx: add suspend/resume support
(Test) i2c: mv64xxx: add suspend/resume support
Marek Szyprowski (1):
(Test) i2c: exynos5: disable fifo-almost-empty irq signal when necessary
Nadav Haklai (1):
(Rev.) i2c: mv64xxx: add suspend/resume support
Simon Glass (1):
(Rev.) dt-bindings: Add Tegra186 BPMP I2C binding
Wolfram Sang (1):
(Rev.) i2c: riic: correctly finish transfers
.../devicetree/bindings/i2c/i2c-mux-pca954x.txt | 14 +-
.../devicetree/bindings/i2c/i2c-sh_mobile.txt | 1 +
.../devicetree/bindings/i2c/i2c-stm32.txt | 33 +
.../bindings/i2c/nvidia,tegra186-bpmp-i2c.txt | 42 +
Documentation/i2c/busses/i2c-i801 | 1 +
Documentation/i2c/muxes/i2c-mux-gpio | 20 +-
drivers/i2c/busses/Kconfig | 22 +
drivers/i2c/busses/Makefile | 2 +
drivers/i2c/busses/i2c-at91.c | 5 +-
drivers/i2c/busses/i2c-bcm2835.c | 4 +-
drivers/i2c/busses/i2c-bfin-twi.c | 2 +-
drivers/i2c/busses/i2c-cros-ec-tunnel.c | 8 +-
drivers/i2c/busses/i2c-designware-core.c | 2 +-
drivers/i2c/busses/i2c-eg20t.c | 2 +-
drivers/i2c/busses/i2c-emev2.c | 2 +-
drivers/i2c/busses/i2c-exynos5.c | 34 +-
drivers/i2c/busses/i2c-i801.c | 3 +
drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +-
drivers/i2c/busses/i2c-imx.c | 2 +-
drivers/i2c/busses/i2c-mv64xxx.c | 21 +
drivers/i2c/busses/i2c-nforce2.c | 2 +-
drivers/i2c/busses/i2c-octeon-core.h | 4 -
drivers/i2c/busses/i2c-omap.c | 2 +-
drivers/i2c/busses/i2c-riic.c | 30 +-
drivers/i2c/busses/i2c-robotfuzz-osif.c | 2 +-
drivers/i2c/busses/i2c-sh_mobile.c | 2 +-
drivers/i2c/busses/i2c-st.c | 2 +-
drivers/i2c/busses/i2c-stm32f4.c | 897 +++++++++++++++++++++
drivers/i2c/busses/i2c-tegra-bpmp.c | 346 ++++++++
drivers/i2c/busses/i2c-thunderx-pcidrv.c | 6 +-
drivers/i2c/busses/i2c-xgene-slimpro.c | 2 +-
drivers/i2c/busses/i2c-xlp9xx.c | 2 +-
drivers/i2c/busses/i2c-xlr.c | 2 +-
drivers/i2c/i2c-core.c | 33 +
drivers/i2c/muxes/i2c-mux-mlxcpld.c | 1 -
drivers/i2c/muxes/i2c-mux-pca9541.c | 1 +
drivers/i2c/muxes/i2c-mux-pca954x.c | 151 +++-
drivers/misc/eeprom/at24.c | 45 +-
include/linux/i2c.h | 1 +
39 files changed, 1675 insertions(+), 78 deletions(-)
create mode 100644 Documentation/devicetree/bindings/i2c/i2c-stm32.txt
create mode 100644 Documentation/devicetree/bindings/i2c/nvidia,tegra186-bpmp-i2c.txt
create mode 100644 drivers/i2c/busses/i2c-stm32f4.c
create mode 100644 drivers/i2c/busses/i2c-tegra-bpmp.c
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-03-31 21:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-03-10 12:33 [PULL REQUEST] i2c for 4.11 Wolfram Sang
2017-03-10 18:12 ` Linus Torvalds
2017-03-11 15:59 ` Wolfram Sang
-- strict thread matches above, loose matches on Subject: below --
2017-03-31 21:09 Wolfram Sang
2017-02-24 21:50 Wolfram Sang
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.