Skip to content

Commit 7e96d76

Browse files
committed
Merge tag 'nand/for-7.0' into mtd/next
SPI NAND - The major feature this release is the support for octal DTR modes (8D-8D-8D). - There has been as well a series of conversion to scoped for each OF child loops. - Support for Foresee F35SQB002G chips has been added. Other changes are small fixes.
2 parents 8753827 + 6c7860a commit 7e96d76

1,151 files changed

Lines changed: 9862 additions & 5345 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.clang-format

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -748,6 +748,7 @@ ForEachMacros:
748748
- 'ynl_attr_for_each_nested'
749749
- 'ynl_attr_for_each_payload'
750750
- 'zorro_for_each_dev'
751+
- 'zpci_bus_for_each'
751752

752753
IncludeBlocks: Preserve
753754
IncludeCategories:

.mailmap

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,8 @@ Barry Song <baohua@kernel.org> <Baohua.Song@csr.com>
127127
Barry Song <baohua@kernel.org> <barry.song@analog.com>
128128
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@sandisk.com>
129129
Bart Van Assche <bvanassche@acm.org> <bart.vanassche@wdc.com>
130-
Bartosz Golaszewski <brgl@bgdev.pl> <bgolaszewski@baylibre.com>
130+
Bartosz Golaszewski <brgl@kernel.org> <bartosz.golaszewski@linaro.org>
131+
Bartosz Golaszewski <brgl@kernel.org> <bgolaszewski@baylibre.com>
131132
Ben Dooks <ben-linux@fluff.org> <ben.dooks@simtec.co.uk>
132133
Ben Dooks <ben-linux@fluff.org> <ben.dooks@sifive.com>
133134
Ben Gardner <bgardner@wabtec.com>
@@ -415,6 +416,7 @@ Juha Yrjola <at solidboot.com>
415416
Juha Yrjola <juha.yrjola@nokia.com>
416417
Juha Yrjola <juha.yrjola@solidboot.com>
417418
Julien Thierry <julien.thierry.kdev@gmail.com> <julien.thierry@arm.com>
419+
Justin Iurman <justin.iurman@gmail.com> <justin.iurman@uliege.be>
418420
Iskren Chernev <me@iskren.info> <iskren.chernev@gmail.com>
419421
Kalle Valo <kvalo@kernel.org> <kvalo@codeaurora.org>
420422
Kalle Valo <kvalo@kernel.org> <quic_kvalo@quicinc.com>
@@ -471,6 +473,10 @@ Linas Vepstas <linas@austin.ibm.com>
471473
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@ascom.ch>
472474
Linus Lüssing <linus.luessing@c0d3.blue> <linus.luessing@web.de>
473475
Linus Lüssing <linus.luessing@c0d3.blue> <ll@simonwunderlich.de>
476+
Linus Walleij <linusw@kernel.org> <linus.walleij@ericsson.com>
477+
Linus Walleij <linusw@kernel.org> <linus.walleij@stericsson.com>
478+
Linus Walleij <linusw@kernel.org> <linus.walleij@linaro.org>
479+
Linus Walleij <linusw@kernel.org> <triad@df.lth.se>
474480
<linux-hardening@vger.kernel.org> <kernel-hardening@lists.openwall.com>
475481
Li Yang <leoyang.li@nxp.com> <leoli@freescale.com>
476482
Li Yang <leoyang.li@nxp.com> <leo@zh-kernel.org>
@@ -704,6 +710,8 @@ Sankeerth Billakanti <quic_sbillaka@quicinc.com> <sbillaka@codeaurora.org>
704710
Santosh Shilimkar <santosh.shilimkar@oracle.org>
705711
Santosh Shilimkar <ssantosh@kernel.org>
706712
Sarangdhar Joshi <spjoshi@codeaurora.org>
713+
Saravana Kannan <saravanak@kernel.org> <skannan@codeaurora.org>
714+
Saravana Kannan <saravanak@kernel.org> <saravanak@google.com>
707715
Sascha Hauer <s.hauer@pengutronix.de>
708716
Sahitya Tummala <quic_stummala@quicinc.com> <stummala@codeaurora.org>
709717
Sathishkumar Muruganandam <quic_murugana@quicinc.com> <murugana@codeaurora.org>
@@ -793,6 +801,7 @@ Tanzir Hasan <tanzhasanwork@gmail.com> <tanzirh@google.com>
793801
Tejun Heo <htejun@gmail.com>
794802
Tomeu Vizoso <tomeu@tomeuvizoso.net> <tomeu.vizoso@collabora.com>
795803
Thomas Graf <tgraf@suug.ch>
804+
Thomas Gleixner <tglx@kernel.org> <tglx@linutronix.de>
796805
Thomas Körper <socketcan@esd.eu> <thomas.koerper@esd.eu>
797806
Thomas Pedersen <twp@codeaurora.org>
798807
Thorsten Blum <thorsten.blum@linux.dev> <thorsten.blum@toblux.com>
@@ -857,7 +866,6 @@ Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@parallels.com>
857866
Vladimir Davydov <vdavydov.dev@gmail.com> <vdavydov@virtuozzo.com>
858867
WangYuli <wangyuli@aosc.io> <wangyl5933@chinaunicom.cn>
859868
WangYuli <wangyuli@aosc.io> <wangyuli@deepin.org>
860-
WangYuli <wangyuli@aosc.io> <wangyuli@uniontech.com>
861869
Weiwen Hu <huweiwen@linux.alibaba.com> <sehuww@mail.scut.edu.cn>
862870
WeiXiong Liao <gmpy.liaowx@gmail.com> <liaoweixiong@allwinnertech.com>
863871
Wen Gong <quic_wgong@quicinc.com> <wgong@codeaurora.org>

CREDITS

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1398,7 +1398,7 @@ D: SRM environment driver (for Alpha systems)
13981398
P: 1024D/8399E1BB 250D 3BCF 7127 0D8C A444 A961 1DBD 5E75 8399 E1BB
13991399

14001400
N: Thomas Gleixner
1401-
E: tglx@linutronix.de
1401+
E: tglx@kernel.org
14021402
D: NAND flash hardware support, JFFS2 on NAND flash
14031403

14041404
N: Jérôme Glisse
@@ -1987,6 +1987,7 @@ D: netfilter: TCP window tracking code
19871987
D: netfilter: raw table
19881988
D: netfilter: iprange match
19891989
D: netfilter: new logging interfaces
1990+
D: netfilter: ipset
19901991
D: netfilter: various other hacks
19911992
S: Tata
19921993
S: Hungary
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
What: /sys/kernel/time/aux_clocks/<ID>/enable
22
Date: May 2025
3-
Contact: Thomas Gleixner <tglx@linutronix.de>
3+
Contact: Thomas Gleixner <tglx@kernel.org>
44
Description:
55
Controls the enablement of auxiliary clock timekeepers.

Documentation/ABI/testing/sysfs-devices-soc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@ Date: January 2012
1717
contact: Lee Jones <lee@kernel.org>
1818
Description:
1919
Read-only attribute common to all SoCs. Contains the SoC machine
20-
name (e.g. Ux500).
20+
name (e.g. DB8500).
2121

2222
What: /sys/devices/socX/family
2323
Date: January 2012
2424
contact: Lee Jones <lee@kernel.org>
2525
Description:
2626
Read-only attribute common to all SoCs. Contains SoC family name
27-
(e.g. DB8500).
27+
(e.g. ux500).
2828

2929
On many of ARM based silicon with SMCCC v1.2+ compliant firmware
3030
this will contain the JEDEC JEP106 manufacturer’s identification

Documentation/admin-guide/blockdev/zoned_loop.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ MB and a zone capacity of 63 MB::
134134

135135
$ modprobe zloop
136136
$ mkdir -p /var/local/zloop/0
137-
$ echo "add capacity_mb=2048,zone_size_mb=64,zone_capacity=63MB" > /dev/zloop-control
137+
$ echo "add capacity_mb=2048,zone_size_mb=64,zone_capacity_mb=63" > /dev/zloop-control
138138

139139
For the device created (/dev/zloop0), the zone backing files are all created
140140
under the default base directory (/var/local/zloop)::

Documentation/arch/riscv/hwprobe.rst

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -281,6 +281,14 @@ The following keys are defined:
281281
* :c:macro:`RISCV_HWPROBE_EXT_ZICBOP`: The Zicbop extension is supported, as
282282
ratified in commit 3dd606f ("Create cmobase-v1.0.pdf") of riscv-CMOs.
283283

284+
* :c:macro:`RISCV_HWPROBE_EXT_ZILSD`: The Zilsd extension is supported as
285+
defined in the RISC-V ISA manual starting from commit f88abf1 ("Integrating
286+
load/store pair for RV32 with the main manual") of the riscv-isa-manual.
287+
288+
* :c:macro:`RISCV_HWPROBE_EXT_ZCLSD`: The Zclsd extension is supported as
289+
defined in the RISC-V ISA manual starting from commit f88abf1 ("Integrating
290+
load/store pair for RV32 with the main manual") of the riscv-isa-manual.
291+
284292
* :c:macro:`RISCV_HWPROBE_KEY_CPUPERF_0`: Deprecated. Returns similar values to
285293
:c:macro:`RISCV_HWPROBE_KEY_MISALIGNED_SCALAR_PERF`, but the key was
286294
mistakenly classified as a bitmask rather than a value.

0 commit comments

Comments
 (0)