Commit 1ebbefb7 authored by Miquel Raynal's avatar Miquel Raynal
Browse files

Merge tag 'tags/spi-octal-dtr' into nand/next 

spi: Octal DTR support

This series adds support for 8D-8D-8D in SPI NAND, which can already be
leveraged without any SPI changes as controllers already have this
support for some SPI NOR devices.

Among the few spi-mem patches, they are needed for building the SPI NAND
changes (especially the ODTR introduction at the end) and therefore an
immutable tag will be needed for merging in the MTD tree (unless all the
series goes through MTD directly ofc).
parents 5ec64aa7 86182718

.clang-format

+1 −0
Original line number Diff line number Diff line
@@ -748,6 +748,7 @@ ForEachMacros: 
  - 'ynl_attr_for_each_nested'

  - 'ynl_attr_for_each_payload'

  - 'zorro_for_each_dev'

  - 'zpci_bus_for_each'



IncludeBlocks: Preserve

IncludeCategories:

.mailmap

+10 −2
Original line number Diff line number Diff line
@@ -127,7 +127,8 @@ Barry Song <baohua@kernel.org> <Baohua.Song@csr.com> 
Barry Song <baohua@kernel.org> <barry.song@analog.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>

Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>

Bartosz Golaszewski <brgl@bgdev.pl> <bgolaszewski@baylibre.com>

Bartosz Golaszewski <brgl@kernel.org> <bartosz.golaszewski@linaro.org>

Bartosz Golaszewski <brgl@kernel.org> <bgolaszewski@baylibre.com>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>

Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>

Ben Gardner <bgardner@wabtec.com>
@@ -415,6 +416,7 @@ Juha Yrjola <at solidboot.com> 
Juha Yrjola <juha.yrjola@nokia.com>

Juha Yrjola <juha.yrjola@solidboot.com>

Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>

Justin Iurman <justin.iurman@gmail.com> <justin.iurman@uliege.be>

Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>

Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>

Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
@@ -471,6 +473,10 @@ Linas Vepstas <linas@austin.ibm.com> 
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>

Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>

Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>

Linus Walleij <linusw@kernel.org> <linus.walleij@ericsson.com>

Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>

Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>

Linus Walleij <linusw@kernel.org> <triad@df.lth.se>

<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>

Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>

Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -704,6 +710,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org> 
Santosh Shilimkar <santosh.shilimkar@oracle.org>

Santosh Shilimkar <ssantosh@kernel.org>

Sarangdhar Joshi <spjoshi@codeaurora.org>

Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>

Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>

Sascha Hauer <s.hauer@pengutronix.de>

Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>

Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
@@ -793,6 +801,7 @@ Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com> 
Tejun Heo <htejun@gmail.com>

Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>

Thomas Graf <tgraf@suug.ch>

Thomas Gleixner <tglx@kernel.org> <tglx@linutronix.de>

Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>

Thomas Pedersen <twp@codeaurora.org>

Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>
@@ -857,7 +866,6 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com> 
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>

WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>

WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>

WangYuli <wangyuli@aosc.io> <wangyuli@uniontech.com>

Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>

WeiXiong Liao <gmpy.liaowx@gmail.com> <liaoweixiong@allwinnertech.com>

Wen Gong <quic_wgong@quicinc.com> <wgong@codeaurora.org>

CREDITS

+2 −1
Original line number Diff line number Diff line
@@ -1398,7 +1398,7 @@ D: SRM environment driver (for Alpha systems) 
P: 1024D/8399E1BB 250D 3BCF 7127 0D8C A444  A961 1DBD 5E75 8399 E1BB



N: Thomas Gleixner

E: tglx@linutronix.de

E: tglx@kernel.org

D: NAND flash hardware support, JFFS2 on NAND flash



N: Jérôme Glisse
@@ -1987,6 +1987,7 @@ D: netfilter: TCP window tracking code 
D: netfilter: raw table

D: netfilter: iprange match

D: netfilter: new logging interfaces

D: netfilter: ipset

D: netfilter: various other hacks

S: Tata

S: Hungary

Documentation/ABI/stable/sysfs-kernel-time-aux-clocks

+1 −1
Original line number Diff line number Diff line 
What:		/sys/kernel/time/aux_clocks/<ID>/enable

Date:		May 2025

Contact:	Thomas Gleixner <tglx@linutronix.de>

Contact:	Thomas Gleixner <tglx@kernel.org>

Description:

		Controls the enablement of auxiliary clock timekeepers.

Documentation/ABI/testing/sysfs-devices-soc

+2 −2
Original line number Diff line number Diff line
@@ -17,14 +17,14 @@ Date: January 2012 
contact:	Lee Jones <lee@kernel.org>

Description:

		Read-only attribute common to all SoCs. Contains the SoC machine

		name (e.g. Ux500).

		name (e.g. DB8500).



What:		/sys/devices/socX/family

Date:		January 2012

contact:	Lee Jones <lee@kernel.org>

Description:

		Read-only attribute common to all SoCs. Contains SoC family name

		(e.g. DB8500).

		(e.g. ux500).



		On many of ARM based silicon with SMCCC v1.2+ compliant firmware

		this will contain the JEDEC JEP106 manufacturer’s identification