[linux-merge]linux integration; annotated tag, v6.0-rc7, created. v6.0-rc7
by postmaster@open-mesh.org
The annotated tag, v6.0-rc7 has been created
at b81e85a3efdc3d610f733fffc6f821f03d8fd490 (tag)
tagging f76349cf41451c5c42a99f18a9163377e4b364ff (commit)
replaces v6.0-rc6
tagged by Linus Torvalds
on Sun Sep 25 14:01:02 2022 -0700
- Shortlog ------------------------------------------------------------
Linux 6.0-rc7
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmMwwY4eHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGdlwH/0ESzdb6F9zYWwHR
E08har56/IfwjOsn1y+JuHibpwUjzskLzdwIfI5zshSZAQTj5/UyC0P7G/wcYh/Z
INh1uHGazmDUkx4O3lwuWLR+mmeUxZRWdq4NTwYDRNPMSiPInVxz+cZJ7y0aPr2e
wii7kMFRHgXmX5DMDEwuHzehsJF7vZrp8zBu2DqzVUGnbwD50nPbyMM3H4g9mute
fAEpDG0X3+smqMaKL+2rK0W/Av/87r3U8ZAztBem3nsCJ9jT7hqMO1ICcKmFMviA
DTERRMwWjPq+mBPE2CiuhdaXvNZBW85Ds81mSddS6MsO6+Tvuzfzik/zSLQJxlBi
vIqYphY=
=NqG+
-----END PGP SIGNATURE-----
Shigeru Yoshida (1):
batman-adv: Fix hang up with small MTU hard-interface
-----------------------------------------------------------------------
--
linux integration
4 months, 1 week
[linux-merge]linux integration; annotated tag, v6.0-rc6, created. v6.0-rc6
by postmaster@open-mesh.org
The annotated tag, v6.0-rc6 has been created
at 3447cb6c198e59b5b4275ecc6d4400a49b9dbaba (tag)
tagging 521a547ced6477c54b4b0cc206000406c221b4d6 (commit)
replaces v6.0-rc5
tagged by Linus Torvalds
on Sun Sep 18 13:44:14 2022 -0700
- Shortlog ------------------------------------------------------------
Linux 6.0-rc6
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmMngx4eHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGQ1AH/1p4oOT4iqaoTueO
MaTQhyvFFcTSLL4y1qejtytNXe4ZEJHyf03jrwtYlfx8RROkZFMJh15G1uWu2deu
43XsUuSWpJ18/C7hRNl1LUazBbuQe30d09zLe7dvD64IAABU6/iQCIorxheTl4EU
NXsda2egJUIbTwn2zdFSgMMJPNORxq8KHgvNY/psIEteC+lFln2l2ZXZ21JAIdBj
lcTbvx6JpJC0AqX1UuO6NsN4nUnEEh110UtYF6lxQ7olkQKwRaUjQIVuWOFLz75n
wDrJxPlVGbDR5zeitDaHkKqWn8LNcqHpDIuAKMxTjT0N/1/sUwHNkyGZXyy1EDJu
e0+SX1c=
=ITjo
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
4 months, 2 weeks
[linux-merge]linux integration; annotated tag, batadv-next-pullrequest-20220916, created. batadv-next-pullrequest-20220916
by postmaster@open-mesh.org
The annotated tag, batadv-next-pullrequest-20220916 has been created
at 8689e7bd15e3c1ad3ba36da4be5c17eeade014f1 (tag)
tagging 76af7483b3c7c42571aae767b553ef7d436305e9 (commit)
replaces v6.0-rc1
tagged by Simon Wunderlich
on Fri Sep 16 18:13:19 2022 +0200
- Shortlog ------------------------------------------------------------
This cleanup patchset includes the following patches:
- bump version strings, by Simon Wunderlich
- drop unused headers in trace.h, by Sven Eckelmann
- drop initialization of flexible ethtool_link_ksettings,
by Sven Eckelmann
- remove unused struct definitions, by Marek Lindner
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmMkoJ8WHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoabXD/9GnQXXxdXa/fAMCdNmQyE78HqN
vAR8QD1qIw7ZBfnbUk+Xzop+r8MwSc42oX5XHsTEHcLNy29LZjnPvpfzmd9v+fnR
9TZ34o5TfqfHomGNIhfTUhZQgsy+5jC045YhzXTYZq/uhpDu+aM3YcJWHvg4jXzV
FHsnH7LW1pfzu8amEBuDhsv4QIgXeY1oTUb78CwQXHfgVZ/yb324cNGsfuUwMenM
41ByVhcW6m+bgfukIQFZYzcDpelgYIG4qd10ZkE67PTDI7/5bSmZgsTlFU4aSKn8
VuyekAivmMZ170cSpzM3BVZzFLQ3t44zNmOFIEUI5kqLQWGZ3E1SEeZCTPFtodp0
buCdlxGJoPrZ/QArgrlEeaWZhvsOVrqJo0s18OgZAF5W5stOKhmJA4mjlacdcTEh
Q54N1WU4X2Zzkk2vJ/K5khEvd+E8IHE5Zsn9BZ0Iujsi6OoSJiLIJr9reJUoqRGw
PsKluQETqFahyDeJHyULjv88xPlZCvr4DXQZTYu9lA37+rSnly/wai9X85/RGziV
00zA1hwYdihKUWQWBtJGOfCj99DkpHw3QLbZKGCmhk+Wfn6JnL34LZLQSzECB0w0
p5a6jz9egnHZmd+MF1H7nDSBUp9znXn6C4tyVEVpPvCv1wmWo0xcp/8L/KNvwqj5
lyfm7txYtlBYcPEyWg==
=Fh8v
-----END PGP SIGNATURE-----
Marek Lindner (1):
batman-adv: remove unused struct definitions
Simon Wunderlich (1):
batman-adv: Start new development cycle
Sven Eckelmann (2):
batman-adv: Drop unused headers in trace.h
batman-adv: Drop initialization of flexible ethtool_link_ksettings
-----------------------------------------------------------------------
--
linux integration
4 months, 2 weeks
[linux-merge]linux integration; annotated tag, batadv-net-pullrequest-20220916, created. batadv-net-pullrequest-20220916
by postmaster@open-mesh.org
The annotated tag, batadv-net-pullrequest-20220916 has been created
at 563108f6cdc44445a979256bfffba81d6ccc306f (tag)
tagging b1cb8a71f1eaec4eb77051590f7f561f25b15e32 (commit)
replaces v6.0-rc1
tagged by Simon Wunderlich
on Fri Sep 16 18:03:51 2022 +0200
- Shortlog ------------------------------------------------------------
Here is a batman-adv bugfix:
- Fix hang up with small MTU hard-interface, by Shigeru Yoshida
-----BEGIN PGP SIGNATURE-----
iQJKBAABCgA0FiEE1ilQI7G+y+fdhnrfoSvjmEKSnqEFAmMknmcWHHN3QHNpbW9u
d3VuZGVybGljaC5kZQAKCRChK+OYQpKeoVFaEACJbgSC/QcTD1D3Ga1jGPdeb6SK
Ik4RGnOIgEWWnsyxigLxWPDHi8mSFEwTGjqiGdmFbBSt0QCOYW6Y1HXxdW6rjqTm
bY1nHLcE+iFdUbZNREux9j/vpEnFNO0hjqfAWIT7W6Q/cdvIUoLIKjtoAdXXLq9j
lq0ScOfW+rT9ibmrWajoGw88LD+tGgZMHSZpzWmtpnqSNmxBcQw/GMGaXkeQwncO
HTXJneGBqs9QQPrCEVanqkg3LPR2lnCic/Y2TpCPGPjGUvxsCg/OBqTt1XjbeB70
xkc2nXoUiGtl0oWkP4xETSqv0l5Mrgs9ZJH1UhLEfnCj4Y0wUHN4XcweYMaE0TaR
gyISkFBZUokZMXs495G+vwgFgMEfydMkPBqSIKEKbUKt/XUKhWqEGchMz0HbrWvc
S/cAmqmzLxNsHkl7jbE6KRW/jRTXPkXJTlaf4Pit6CrN0fam2RvJd7B27APMt6qg
FQpqRhlY21LqNADBGl46NMDnLrewi5OL0NoigcKRmXEWG/VF8duLbBklWGe1zEov
zmpeYupXF/vHiVl6ZKWzF4U8ZBzGosBrcej2tuTuHhyDIAFgSGTqCP5bl5CErRf/
buOH9/NBo8xGyIAZkD33wUwAHf7L74cpTgHdAcnhwnhV/YewL/S6IML1azC50yFy
7tZhKTzTIxpqT+cf5Q==
=w5ul
-----END PGP SIGNATURE-----
Shigeru Yoshida (1):
batman-adv: Fix hang up with small MTU hard-interface
-----------------------------------------------------------------------
--
linux integration
4 months, 2 weeks
[alfred] master: alfred: remove unnecessary backslash (f3b478f)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/alfred
On branch : master
>---------------------------------------------------------------
commit f3b478f46f967062be61ba40536ca701e74780d9
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Wed Sep 14 20:40:34 2022 +0200
alfred: remove unnecessary backslash
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
f3b478f46f967062be61ba40536ca701e74780d9
alfred.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/alfred.h b/alfred.h
index 97f0093..a4a3d37 100644
--- a/alfred.h
+++ b/alfred.h
@@ -210,7 +210,7 @@ int unix_sock_close(struct globals *globals);
int unix_sock_req_data_finish(struct globals *globals,
struct transaction_head *head);
void unix_sock_events_close_all(struct globals *globals);
-void unix_sock_event_notify(struct globals *globals, uint8_t type,\
+void unix_sock_event_notify(struct globals *globals, uint8_t type,
const uint8_t source[ETH_ALEN]);
/* vis.c */
int vis_update_data(struct globals *globals);
4 months, 2 weeks
[alfred] master: alfred: improve grammar in documentation of '-r' argument (678c732)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/alfred
On branch : master
>---------------------------------------------------------------
commit 678c732274911d26e2afbfb3031eb0c09d6436a1
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Wed Sep 14 20:40:35 2022 +0200
alfred: improve grammar in documentation of '-r' argument
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
678c732274911d26e2afbfb3031eb0c09d6436a1
main.c | 3 +--
man/alfred.8 | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/main.c b/main.c
index 2c3f06e..0f242e8 100644
--- a/main.c
+++ b/main.c
@@ -30,8 +30,7 @@ static void alfred_usage(void)
printf("client mode options:\n");
printf(" -s, --set-data [data type] sets new data to distribute from stdin\n");
printf(" for the supplied data type (0-255)\n");
- printf(" -r, --request [data type] collect data from the network and prints\n");
- printf(" it on stdout\n");
+ printf(" -r, --request [data type] collect data from the network and print on stdout\n");
printf(" -d, --verbose Show extra information in the data output\n");
printf(" -V, --req-version specify the data version set for -s\n");
printf(" -M, --modeswitch primary switch daemon to mode primary\n");
diff --git a/man/alfred.8 b/man/alfred.8
index 20c703b..e6e4a8d 100644
--- a/man/alfred.8
+++ b/man/alfred.8
@@ -67,7 +67,7 @@ must be periodically written again to alfred, otherwise it will timeout and
alfred will forget about it (after 10 minutes).
.TP
\fB\-r\fP, \fB\-\-request\fP \fIdata\-type\fP
-Collect data from the network and prints it on stdout
+Collect data from the network and print on stdout
.TP
\fB\-d\fP, \fB\-\-verbose\fP
Show extra information in the data output
4 months, 2 weeks
[batman-adv] master: batman-adv: remove unused struct definitions (402531de)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit 402531de6237377a080eb415c890ae2a22765f29
Author: Marek Lindner <mareklindner(a)neomailbox.ch>
Date: Wed Sep 14 20:37:11 2022 +0200
batman-adv: remove unused struct definitions
Signed-off-by: Marek Lindner <mareklindner(a)neomailbox.ch>
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
402531de6237377a080eb415c890ae2a22765f29
net/batman-adv/types.h | 39 ---------------------------------------
1 file changed, 39 deletions(-)
diff --git a/net/batman-adv/types.h b/net/batman-adv/types.h
index 2be5d4a7..758cd797 100644
--- a/net/batman-adv/types.h
+++ b/net/batman-adv/types.h
@@ -1740,45 +1740,6 @@ struct batadv_priv {
#endif
};
-/**
- * struct batadv_socket_client - layer2 icmp socket client data
- */
-struct batadv_socket_client {
- /**
- * @queue_list: packet queue for packets destined for this socket client
- */
- struct list_head queue_list;
-
- /** @queue_len: number of packets in the packet queue (queue_list) */
- unsigned int queue_len;
-
- /** @index: socket client's index in the batadv_socket_client_hash */
- unsigned char index;
-
- /** @lock: lock protecting queue_list, queue_len & index */
- spinlock_t lock;
-
- /** @queue_wait: socket client's wait queue */
- wait_queue_head_t queue_wait;
-
- /** @bat_priv: pointer to soft_iface this client belongs to */
- struct batadv_priv *bat_priv;
-};
-
-/**
- * struct batadv_socket_packet - layer2 icmp packet for socket client
- */
-struct batadv_socket_packet {
- /** @list: list node for &batadv_socket_client.queue_list */
- struct list_head list;
-
- /** @icmp_len: size of the layer2 icmp packet */
- size_t icmp_len;
-
- /** @icmp_packet: layer2 icmp packet */
- u8 icmp_packet[BATADV_ICMP_MAX_PACKET_SIZE];
-};
-
#ifdef CONFIG_BATMAN_ADV_BLA
/**
4 months, 2 weeks
[linux-merge]linux integration; annotated tag, v6.0-rc5, created. v6.0-rc5
by postmaster@open-mesh.org
The annotated tag, v6.0-rc5 has been created
at 52868a8b445605ea56831f92b5607ae3183f09bd (tag)
tagging 80e78fcce86de0288793a0ef0f6acf37656ee4cf (commit)
replaces v6.0-rc4
tagged by Linus Torvalds
on Sun Sep 11 16:22:01 2022 -0400
- Shortlog ------------------------------------------------------------
Linux 6.0-rc5
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmMeQ2keHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGYRMH+gLNHiGirGZlm2GQ
tKaZQUy7MiXuIP0hGDonDIIIAmIVhnjm9MDG8KT4W8AvEd7ukncyYqJfwWeWQPhP
4mZcf6l3Z8Ke+qiaFpXpMPCxTyWcln1ox0EoNx2g9gdPxZntaRuuaTQVljUfTiey
aVPHxve8ip3G7jDoJnuLSxESOqWxkb8v/SshBP1E5bF5BZ+cgZRqq7FNigFqxjbk
wF29K09BVOPjdgkSvY/b0/SnL5KlSdMAv+FrPcJNGivcdIPgf/qJks5cI2HRUo7o
CpKgbcLorCVyD+d+zLonJBwIy3arbmKD8JqYnfdTSIqVOUqHXWUDfeydsH32u1Gu
lPSI2Hw=
=7LTL
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
4 months, 3 weeks
[batman-adv] master: batman-adv: genetlink: start to validate reserved header bytes (e8b0836b)
by postmaster@open-mesh.org
Repository : ssh://git@diktynna/batman-adv
On branch : master
>---------------------------------------------------------------
commit e8b0836b9660b18e9be8be13e53e44768ae9761d
Author: Jakub Kicinski <kuba(a)kernel.org>
Date: Wed Aug 24 17:18:30 2022 -0700
batman-adv: genetlink: start to validate reserved header bytes
We had historically not checked that genlmsghdr.reserved
is 0 on input which prevents us from using those precious
bytes in the future.
One use case would be to extend the cmd field, which is
currently just 8 bits wide and 256 is not a lot of commands
for some core families.
To make sure that new families do the right thing by default
put the onus of opting out of validation on existing families.
Signed-off-by: Jakub Kicinski <kuba(a)kernel.org>
Acked-by: Paul Moore <paul(a)paul-moore.com> (NetLabel)
Signed-off-by: David S. Miller <davem(a)davemloft.net>
[sven(a)narfation.org: Add compat code]
Signed-off-by: Sven Eckelmann <sven(a)narfation.org>
>---------------------------------------------------------------
e8b0836b9660b18e9be8be13e53e44768ae9761d
net/batman-adv/netlink.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/net/batman-adv/netlink.c b/net/batman-adv/netlink.c
index 00875e1d..63253d4a 100644
--- a/net/batman-adv/netlink.c
+++ b/net/batman-adv/netlink.c
@@ -1493,6 +1493,9 @@ struct genl_family batadv_netlink_family __ro_after_init = {
.module = THIS_MODULE,
.small_ops = batadv_netlink_ops,
.n_small_ops = ARRAY_SIZE(batadv_netlink_ops),
+#if LINUX_VERSION_IS_GEQ(6, 1, 0) // UGLY_HACK_NEW
+ .resv_start_op = BATADV_CMD_SET_VLAN + 1,
+#endif // UGLY_HACK_STOP
.mcgrps = batadv_netlink_mcgrps,
.n_mcgrps = ARRAY_SIZE(batadv_netlink_mcgrps),
};
4 months, 3 weeks
[linux-merge]linux integration; annotated tag, v6.0-rc4, created. v6.0-rc4
by postmaster@open-mesh.org
The annotated tag, v6.0-rc4 has been created
at 96e1a1037aedb9f9596e2af5a6fcaa8053dafe4f (tag)
tagging 7e18e42e4b280c85b76967a9106a13ca61c16179 (commit)
replaces v6.0-rc3
tagged by Linus Torvalds
on Sun Sep 4 13:10:01 2022 -0700
- Shortlog ------------------------------------------------------------
Linux 6.0-rc4
-----BEGIN PGP SIGNATURE-----
iQFSBAABCAA8FiEEq68RxlopcLEwq+PEeb4+QwBBGIYFAmMVBhkeHHRvcnZhbGRz
QGxpbnV4LWZvdW5kYXRpb24ub3JnAAoJEHm+PkMAQRiGZ4QH/13A3r0SLRUzVn0X
fsw7V7algKkA4GosU+UDekolGLU8CF3v4wn9dnZN6FNfgBeS+fBOZBriFLytZK/q
EUXyEtKIpjWQT0f9JwLAq1vMfFWqMIYoEJbzKVtJSsBkaZfhmOINiSbgmR5mCxvv
s0XibQPs8POYbUEYdTosbs7PNUPBXrx1kBhMNLFCctoM38J7GB2woVBGl8s81v1a
evT0+fGuXLZskIRpgFUlHOYAuiuGPAXmYnt92fiRuSSDQo40Q7LDLp2V3RrOizuz
RdzZQdsTBZ1vM6jk2GPSoQMith6L71XuXA91q7NvRF4kxT5QI17o2q6tgnkeEfPJ
Xgw4MJU=
=Lr3i
-----END PGP SIGNATURE-----
-----------------------------------------------------------------------
--
linux integration
4 months, 4 weeks