Skip to content

Commit

Permalink
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Browse files Browse the repository at this point in the history
net/mptcp/protocol.c
  977d293 ("mptcp: ensure tx skbs always have the MPTCP ext")
  efe686f ("mptcp: ensure tx skbs always have the MPTCP ext")

same patch merged in both trees, keep net-next.

Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
kuba-moo committed Sep 23, 2021
2 parents 9aad3e4 + 9bc62af commit 2fcd14d
Show file tree
Hide file tree
Showing 332 changed files with 3,498 additions and 1,318 deletions.
2 changes: 1 addition & 1 deletion Documentation/devicetree/bindings/arm/tegra.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ properties:
- const: toradex,apalis_t30
- const: nvidia,tegra30
- items:
- const: toradex,apalis_t30-eval-v1.1
- const: toradex,apalis_t30-v1.1-eval
- const: toradex,apalis_t30-eval
- const: toradex,apalis_t30-v1.1
- const: toradex,apalis_t30
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ function block.

All DISP device tree nodes must be siblings to the central MMSYS_CONFIG node.
For a description of the MMSYS_CONFIG binding, see
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.txt.
Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml.

DISP function blocks
====================
Expand Down
89 changes: 89 additions & 0 deletions Documentation/devicetree/bindings/ufs/samsung,exynos-ufs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
%YAML 1.2
---
$id: http://devicetree.org/schemas/ufs/samsung,exynos-ufs.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: Samsung SoC series UFS host controller Device Tree Bindings

maintainers:
- Alim Akhtar <[email protected]>

description: |
Each Samsung UFS host controller instance should have its own node.
This binding define Samsung specific binding other then what is used
in the common ufshcd bindings
[1] Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt
properties:

compatible:
enum:
- samsung,exynos7-ufs

reg:
items:
- description: HCI register
- description: vendor specific register
- description: unipro register
- description: UFS protector register

reg-names:
items:
- const: hci
- const: vs_hci
- const: unipro
- const: ufsp

clocks:
items:
- description: ufs link core clock
- description: unipro main clock

clock-names:
items:
- const: core_clk
- const: sclk_unipro_main

interrupts:
maxItems: 1

phys:
maxItems: 1

phy-names:
const: ufs-phy

required:
- compatible
- reg
- interrupts
- phys
- phy-names
- clocks
- clock-names

additionalProperties: false

examples:
- |
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/exynos7-clk.h>
ufs: ufs@15570000 {
compatible = "samsung,exynos7-ufs";
reg = <0x15570000 0x100>,
<0x15570100 0x100>,
<0x15571000 0x200>,
<0x15572000 0x300>;
reg-names = "hci", "vs_hci", "unipro", "ufsp";
interrupts = <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&clock_fsys1 ACLK_UFS20_LINK>,
<&clock_fsys1 SCLK_UFSUNIPRO20_USER>;
clock-names = "core_clk", "sclk_unipro_main";
pinctrl-names = "default";
pinctrl-0 = <&ufs_rst_n &ufs_refclk_out>;
phys = <&ufs_phy>;
phy-names = "ufs-phy";
};
...
Original file line number Diff line number Diff line change
Expand Up @@ -851,7 +851,7 @@ NOTES:
- 0x88A8 traffic will not be received unless VLAN stripping is disabled with
the following command::

# ethool -K <ethX> rxvlan off
# ethtool -K <ethX> rxvlan off

- 0x88A8/0x8100 double VLANs cannot be used with 0x8100 or 0x8100/0x8100 VLANS
configured on the same port. 0x88a8/0x8100 traffic will not be received if
Expand Down
2 changes: 1 addition & 1 deletion Documentation/networking/dsa/sja1105.rst
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ not available.
Device Tree bindings and board design
=====================================

This section references ``Documentation/devicetree/bindings/net/dsa/sja1105.txt``
This section references ``Documentation/devicetree/bindings/net/dsa/nxp,sja1105.yaml``
and aims to showcase some potential switch caveats.

RMII PHY role and out-of-band signaling
Expand Down
22 changes: 11 additions & 11 deletions MAINTAINERS
Original file line number Diff line number Diff line change
Expand Up @@ -2804,9 +2804,8 @@ F: arch/arm/mach-pxa/include/mach/vpac270.h
F: arch/arm/mach-pxa/vpac270.c

ARM/VT8500 ARM ARCHITECTURE
M: Tony Prisk <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Maintained
S: Orphan
F: Documentation/devicetree/bindings/i2c/i2c-wmt.txt
F: arch/arm/mach-vt8500/
F: drivers/clocksource/timer-vt8500.c
Expand Down Expand Up @@ -13255,9 +13254,9 @@ F: Documentation/scsi/NinjaSCSI.rst
F: drivers/scsi/nsp32*

NIOS2 ARCHITECTURE
M: Ley Foon Tan <[email protected]>
M: Dinh Nguyen <[email protected]>
S: Maintained
T: git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git
T: git git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git
F: arch/nios2/

NITRO ENCLAVES (NE)
Expand Down Expand Up @@ -14342,7 +14341,8 @@ F: Documentation/devicetree/bindings/pci/intel,ixp4xx-pci.yaml
F: drivers/pci/controller/pci-ixp4xx.c

PCI DRIVER FOR INTEL VOLUME MANAGEMENT DEVICE (VMD)
M: Jonathan Derrick <[email protected]>
M: Nirmal Patel <[email protected]>
R: Jonathan Derrick <[email protected]>
L: [email protected]
S: Supported
F: drivers/pci/controller/vmd.c
Expand Down Expand Up @@ -16955,7 +16955,6 @@ F: drivers/misc/sgi-xp/

SHARED MEMORY COMMUNICATIONS (SMC) SOCKETS
M: Karsten Graul <[email protected]>
M: Guvenc Gulce <[email protected]>
L: [email protected]
S: Supported
W: http://www.ibm.com/developerworks/linux/linux390/
Expand Down Expand Up @@ -17968,10 +17967,11 @@ F: Documentation/admin-guide/svga.rst
F: arch/x86/boot/video*

SWIOTLB SUBSYSTEM
M: Konrad Rzeszutek Wilk <[email protected]>
M: Christoph Hellwig <[email protected]>
L: [email protected]
S: Supported
T: git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git
W: http://git.infradead.org/users/hch/dma-mapping.git
T: git git://git.infradead.org/users/hch/dma-mapping.git
F: arch/*/kernel/pci-swiotlb.c
F: include/linux/swiotlb.h
F: kernel/dma/swiotlb.c
Expand Down Expand Up @@ -20474,7 +20474,6 @@ F: samples/bpf/xdpsock*
F: tools/lib/bpf/xsk*

XEN BLOCK SUBSYSTEM
M: Konrad Rzeszutek Wilk <[email protected]>
M: Roger Pau Monné <[email protected]>
L: [email protected] (moderated for non-subscribers)
S: Supported
Expand Down Expand Up @@ -20522,7 +20521,7 @@ S: Supported
F: drivers/net/xen-netback/*

XEN PCI SUBSYSTEM
M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
M: Juergen Gross <jgross@suse.com>
L: [email protected] (moderated for non-subscribers)
S: Supported
F: arch/x86/pci/*xen*
Expand All @@ -20545,7 +20544,8 @@ S: Supported
F: sound/xen/*

XEN SWIOTLB SUBSYSTEM
M: Konrad Rzeszutek Wilk <[email protected]>
M: Juergen Gross <[email protected]>
M: Stefano Stabellini <[email protected]>
L: [email protected] (moderated for non-subscribers)
L: [email protected]
S: Supported
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
VERSION = 5
PATCHLEVEL = 15
SUBLEVEL = 0
EXTRAVERSION = -rc1
EXTRAVERSION = -rc2
NAME = Opossums on Parade

# *DOCUMENTATION*
Expand Down
3 changes: 1 addition & 2 deletions arch/alpha/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ config ALPHA
select NEED_SG_DMA_LENGTH
select VIRT_TO_BUS
select GENERIC_IRQ_PROBE
select GENERIC_PCI_IOMAP if PCI
select GENERIC_PCI_IOMAP
select AUTO_IRQ_AFFINITY if SMP
select GENERIC_IRQ_SHOW
select ARCH_WANT_IPC_PARSE_VERSION
Expand Down Expand Up @@ -199,7 +199,6 @@ config ALPHA_EIGER

config ALPHA_JENSEN
bool "Jensen"
depends on BROKEN
select HAVE_EISA
help
DEC PC 150 AXP (aka Jensen): This is a very old Digital system - one
Expand Down
1 change: 1 addition & 0 deletions arch/alpha/include/asm/asm-prototypes.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ extern void __divlu(void);
extern void __remlu(void);
extern void __divqu(void);
extern void __remqu(void);
extern unsigned long __udiv_qrnnd(unsigned long *, unsigned long, unsigned long , unsigned long);
8 changes: 4 additions & 4 deletions arch/alpha/include/asm/jensen.h
Original file line number Diff line number Diff line change
Expand Up @@ -111,18 +111,18 @@ __EXTERN_INLINE void jensen_set_hae(unsigned long addr)
* convinced that I need one of the newer machines.
*/

static inline unsigned int jensen_local_inb(unsigned long addr)
__EXTERN_INLINE unsigned int jensen_local_inb(unsigned long addr)
{
return 0xff & *(vuip)((addr << 9) + EISA_VL82C106);
}

static inline void jensen_local_outb(u8 b, unsigned long addr)
__EXTERN_INLINE void jensen_local_outb(u8 b, unsigned long addr)
{
*(vuip)((addr << 9) + EISA_VL82C106) = b;
mb();
}

static inline unsigned int jensen_bus_inb(unsigned long addr)
__EXTERN_INLINE unsigned int jensen_bus_inb(unsigned long addr)
{
long result;

Expand All @@ -131,7 +131,7 @@ static inline unsigned int jensen_bus_inb(unsigned long addr)
return __kernel_extbl(result, addr & 3);
}

static inline void jensen_bus_outb(u8 b, unsigned long addr)
__EXTERN_INLINE void jensen_bus_outb(u8 b, unsigned long addr)
{
jensen_set_hae(0);
*(vuip)((addr << 7) + EISA_IO + 0x00) = b * 0x01010101;
Expand Down
10 changes: 5 additions & 5 deletions arch/alpha/kernel/sys_jensen.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@
*
* Code supporting the Jensen.
*/
#define __EXTERN_INLINE
#include <asm/io.h>
#include <asm/jensen.h>
#undef __EXTERN_INLINE

#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/types.h>
Expand All @@ -17,11 +22,6 @@

#include <asm/ptrace.h>

#define __EXTERN_INLINE inline
#include <asm/io.h>
#include <asm/jensen.h>
#undef __EXTERN_INLINE

#include <asm/dma.h>
#include <asm/irq.h>
#include <asm/mmu_context.h>
Expand Down
1 change: 1 addition & 0 deletions arch/alpha/lib/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ev6-$(CONFIG_ALPHA_EV6) := ev6-
ev67-$(CONFIG_ALPHA_EV67) := ev67-

lib-y = __divqu.o __remqu.o __divlu.o __remlu.o \
udiv-qrnnd.o \
udelay.o \
$(ev6-y)memset.o \
$(ev6-y)memcpy.o \
Expand Down
2 changes: 2 additions & 0 deletions arch/alpha/math-emu/qrnnd.S → arch/alpha/lib/udiv-qrnnd.S
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
# along with GCC; see the file COPYING. If not, write to the
# Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
# MA 02111-1307, USA.
#include <asm/export.h>

.set noreorder
.set noat
Expand Down Expand Up @@ -161,3 +162,4 @@ $Odd:
ret $31,($26),1

.end __udiv_qrnnd
EXPORT_SYMBOL(__udiv_qrnnd)
2 changes: 1 addition & 1 deletion arch/alpha/math-emu/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ ccflags-y := -w

obj-$(CONFIG_MATHEMU) += math-emu.o

math-emu-objs := math.o qrnnd.o
math-emu-objs := math.o
2 changes: 0 additions & 2 deletions arch/alpha/math-emu/math.c
Original file line number Diff line number Diff line change
Expand Up @@ -403,5 +403,3 @@ alpha_fp_emul_imprecise (struct pt_regs *regs, unsigned long write_mask)
egress:
return si_code;
}

EXPORT_SYMBOL(__udiv_qrnnd);
2 changes: 1 addition & 1 deletion arch/arm64/kernel/fpsimd.c
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ size_t sve_state_size(struct task_struct const *task)
void sve_alloc(struct task_struct *task)
{
if (task->thread.sve_state) {
memset(task->thread.sve_state, 0, sve_state_size(current));
memset(task->thread.sve_state, 0, sve_state_size(task));
return;
}

Expand Down
3 changes: 1 addition & 2 deletions arch/arm64/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <linux/mman.h>
#include <linux/mm.h>
#include <linux/nospec.h>
#include <linux/sched.h>
#include <linux/stddef.h>
#include <linux/sysctl.h>
#include <linux/unistd.h>
Expand Down Expand Up @@ -58,7 +57,7 @@

#if defined(CONFIG_STACKPROTECTOR) && !defined(CONFIG_STACKPROTECTOR_PER_TASK)
#include <linux/stackprotector.h>
unsigned long __stack_chk_guard __read_mostly;
unsigned long __stack_chk_guard __ro_after_init;
EXPORT_SYMBOL(__stack_chk_guard);
#endif

Expand Down
4 changes: 3 additions & 1 deletion arch/parisc/lib/iomap.c
Original file line number Diff line number Diff line change
Expand Up @@ -513,12 +513,15 @@ void ioport_unmap(void __iomem *addr)
}
}

#ifdef CONFIG_PCI
void pci_iounmap(struct pci_dev *dev, void __iomem * addr)
{
if (!INDIRECT_ADDR(addr)) {
iounmap(addr);
}
}
EXPORT_SYMBOL(pci_iounmap);
#endif

EXPORT_SYMBOL(ioread8);
EXPORT_SYMBOL(ioread16);
Expand All @@ -544,4 +547,3 @@ EXPORT_SYMBOL(iowrite16_rep);
EXPORT_SYMBOL(iowrite32_rep);
EXPORT_SYMBOL(ioport_map);
EXPORT_SYMBOL(ioport_unmap);
EXPORT_SYMBOL(pci_iounmap);
Loading

0 comments on commit 2fcd14d

Please sign in to comment.