Linus Torvalds
107df03203
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
1) Fix memory leak in nftables, from Liping Zhang.
2) Need to check result of vlan_insert_tag() in batman-adv otherwise we
risk NULL skb derefs, from Sven Eckelmann.
3) Check for dev_alloc_skb() failures in cfg80211, from Gregory
Greenman.
4) Handle properly when we have ppp_unregister_channel() happening in
parallel with ppp_connect_channel(), from WANG Cong.
5) Fix DCCP deadlock, from Eric Dumazet.
6) Bail out properly in UDP if sk_filter() truncates the packet to be
smaller than even the space that the protocol headers need. From
Michal Kubecek.
7) Similarly for rose, dccp, and sctp, from Willem de Bruijn.
8) Make TCP challenge ACKs less predictable, from Eric Dumazet.
9) Fix infinite loop in bgmac_dma_tx_add() from Florian Fainelli.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (65 commits)
packet: propagate sock_cmsg_send() error
net/mlx5e: Fix del vxlan port command buffer memset
packet: fix second argument of sock_tx_timestamp()
net: switchdev: change ageing_time type to clock_t
Update maintainer for EHEA driver.
net/mlx4_en: Add resilience in low memory systems
net/mlx4_en: Move filters cleanup to a proper location
sctp: load transport header after sk_filter
net/sched/sch_htb: clamp xstats tokens to fit into 32-bit int
net: cavium: liquidio: Avoid dma_unmap_single on uninitialized ndata
net: nb8800: Fix SKB leak in nb8800_receive()
et131x: Fix logical vs bitwise check in et131x_tx_timeout()
vlan: use a valid default mtu value for vlan over macsec
net: bgmac: Fix infinite loop in bgmac_dma_tx_add()
mlxsw: spectrum: Prevent invalid ingress buffer mapping
mlxsw: spectrum: Prevent overwrite of DCB capability fields
mlxsw: spectrum: Don't emit errors when PFC is disabled
mlxsw: spectrum: Indicate support for autonegotiation
mlxsw: spectrum: Force link training according to admin state
r8152: add MODULE_VERSION
...
2016-07-23 15:44:31 +09:00
x86/quirks: Add early quirk to reset Apple AirPort card
2016-07-10 20:13:53 +02:00
can: fix handling of unmodifiable configuration options
2016-05-09 11:07:28 +02:00
libceph: change ceph_osdmap_flag() to take osdc
2016-05-30 23:00:22 +02:00
phy: tegra: Changes for v4.7-rc1
2016-05-09 16:18:37 +02:00
Merge branch 'topic/xilinx' into for-linus
2016-05-17 10:15:34 +05:30
iio: st_sensors: switch to a threaded interrupt
2016-05-29 20:21:41 +01:00
irqchip/gic-v3: Fix copy+paste mistakes in defines
2016-06-02 17:59:44 +01:00
mfd: da9053: Fix compiler warning message for uninitialised variable
2016-06-30 07:44:23 +01:00
net/mlx4_en: Avoid unregister_netdev at shutdown flow
2016-06-22 16:38:11 -04:00
net/mlx5: Add timeout handle to commands with callback
2016-07-01 06:12:03 -04:00
MMC core:
2016-05-26 09:36:10 -07:00
mtd: spi-nor: support GigaDevice gd25lq64c
2016-05-10 15:44:18 -07:00
netfilter: fix IS_ERR_VALUE usage
2016-04-29 11:02:33 +02:00
arm64/perf: Filter common events based on PMCEIDn_EL0
2016-04-25 14:11:10 +01:00
phy: Add Tegra XUSB pad controller support
2016-04-29 16:44:47 +02:00
misc: at24: Fix typo in at24 header file
2016-05-26 20:52:15 +02:00
qed*: Don't reset statistics on inner reload
2016-06-19 10:47:32 -07:00
regulator: Silence build warnings from regulator_can_change_voltage()
2016-05-17 18:06:18 +01:00
ARM: SoC driver updates for v4.7
2016-05-18 13:14:02 -07:00
spi: core: add hook flash_read_supported to spi_master
2016-04-25 18:51:31 +01:00
rpc: share one xps between all backchannels
2016-06-15 10:32:25 -04:00
USB: EHCI: declare hostpc register as zero-length array
2016-06-24 17:03:12 -07:00
Merge branches 'acpi-pci', 'acpi-misc' and 'acpi-tools'
2016-05-16 16:45:48 +02:00
Merge branch 'for-4.7-zac' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata
2016-05-23 17:53:39 -07:00
locking/atomics: Flip atomic_fetch_or() arguments
2016-05-05 09:58:52 +02:00
Merge branch 'stable-4.7' of git://git.infradead.org/users/pcmoore/audit
2016-06-29 15:18:47 -07:00
video / backlight: remove the backlight_device_registered API
2016-05-04 23:41:14 +02:00
MIPS: BCM47xx: Move SPROM driver to drivers/firmware/
2016-05-13 14:01:43 +02:00
coredump: fix dumping through pipes
2016-06-07 22:07:09 -04:00
block: make bio_inc_remaining() interface accessible again
2016-05-05 13:03:29 -06:00
md: set MD_CHANGE_PENDING in a atomic region
2016-05-09 09:24:02 -07:00
block: copy NOMERGE flag from bio to request
2016-04-25 19:13:44 -06:00
DAX error handling for 4.7
2016-05-26 19:34:26 -07:00
blk-throttle: don't parse cgroup path if trace isn't enabled
2016-05-10 08:41:37 -06:00
include/linux: apply __malloc attribute
2016-05-19 19:12:14 -07:00
bpf, perf: delay release of BPF prog after grace period
2016-06-29 05:42:55 -04:00
cgroup, cpuset: replace cpuset_post_attach_flush() with cgroup_subsys->post_attach callback
2016-04-25 15:45:14 -04:00
clk: Remove CLK_IS_ROOT flag
2016-06-01 14:56:57 -07:00
mm, oom, compaction: prevent from should_compact_retry looping for ever for costly orders
2016-05-20 17:58:30 -07:00
compiler.h: add support for malloc attribute
2016-05-19 19:12:14 -07:00
compiler.h: add support for malloc attribute
2016-05-19 19:12:14 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2016-05-23 11:48:48 -07:00
coresight: stm: adding driver for CoreSight STM component
2016-05-03 14:59:30 -07:00
sched/hotplug: Move migration CPU_DYING to sched_cpu_dying()
2016-05-06 14:58:25 +02:00
sched/hotplug: Make activate() the last hotplug step
2016-05-06 14:58:25 +02:00
cpuidle: Do not access cpuidle_devices when !CONFIG_CPU_IDLE
2016-06-02 23:05:27 +02:00
sched: Allow per-cpu kernel threads to run on online && !active
2016-05-06 14:58:22 +02:00
cpuset: use static key better and convert to new API
2016-05-19 19:12:14 -07:00
crash_dump: Add vmcore_elf32_check_arch
2016-05-13 14:01:59 +02:00
Filesystem DAX locking for 4.7
2016-05-26 20:00:28 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-06-20 10:41:51 -07:00
debugobjects: insulate non-fixup logic related to static obj from fixup callbacks
2016-05-19 19:12:14 -07:00
PM / devfreq: Add new passive governor
2016-05-03 11:20:07 +09:00
driver core update for 4.7-rc1
2016-05-20 21:26:15 -07:00
devpts: Make each mount of devpts an independent filesystem.
2016-06-05 10:36:01 -07:00
dma-buf: headerdoc fixes
2016-05-31 22:12:43 +05:30
iommu/dma: Finish optimising higher-order allocations
2016-05-09 15:33:29 +02:00
iommu: of: enforce const-ness of struct iommu_ops
2016-05-09 15:33:29 +02:00
efi: Fix for_each_efi_memory_desc_in_map() for empty memmaps
2016-06-03 09:57:35 +02:00
make IS_ERR_VALUE() complain about non-pointer-sized arguments
2016-05-27 16:03:22 -07:00
pnfs: rework LAYOUTGET retry handling
2016-05-17 15:48:12 -04:00
fbdev: fb_defio: Export fb_deferred_io_mmap
2016-05-02 16:24:49 +02:00
fence: add missing descriptions for fence
2016-05-31 22:17:05 +05:30
give readdir(2)/getdents(2)/etc. uniform exclusion with lseek()
2016-05-02 19:49:28 -04:00
rose: limit sk_filter trim to payload
2016-07-13 11:53:40 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-05-27 17:14:05 -07:00
FS-Cache: make check_consistency callback return int
2016-06-01 10:29:39 +02:00
fscrypto/f2fs: allow fs-specific key prefix for fs encryption
2016-05-07 10:32:33 -07:00
fsnotify: avoid spurious EMFILE errors from inotify_init()
2016-05-19 19:12:14 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching
2016-05-17 17:11:27 -07:00
include/linux/genhd.h: move to use generic UUID library
2016-05-20 17:58:30 -07:00
block/drbd: align properly u64 in nl messages
2016-05-10 15:43:09 -04:00
printk/nmi: generic solution for safe printk in NMI
2016-05-20 17:58:30 -07:00
<linux/hash.h>: Add support for architecture-specific functions
2016-05-28 15:48:31 -04:00
mm: thp: move pmd check inside ptl for freeze_page()
2016-07-15 14:54:27 +09:00
include/linux/hugetlb.h: use bool instead of int for hugepage_migration_supported()
2016-05-20 17:58:30 -07:00
include/linux/hugetlb*.h: clean up code
2016-05-20 17:58:30 -07:00
mm/hugetlb: is_vm_hugetlb_page() can return bool
2016-05-19 19:12:14 -07:00
drivers:hv: Make a function to free mmio regions through vmbus
2016-04-30 14:01:37 -07:00
i2c: mux: relax locking of the top i2c adapter during mux-locked muxing
2016-05-04 22:39:17 +02:00
i2c: mux: relax locking of the top i2c adapter during mux-locked muxing
2016-05-04 22:39:17 +02:00
vxlan: Add checksum check to the features check function
2016-05-03 16:00:54 -04:00
ima: add support for creating files using the mknodat syscall
2016-05-01 09:23:52 -04:00
net: diag: add missing declarations
2016-06-10 23:22:55 -07:00
fix up initial thread stack pointer vs thread_info confusion
2016-06-24 17:07:33 -07:00
io-64-nonatomic: Add relaxed accessor variants
2016-05-03 18:23:02 +01:00
io-64-nonatomic: Add relaxed accessor variants
2016-05-03 18:23:02 +01:00
Merge branches 'arm/io-pgtable', 'arm/rockchip', 'arm/omap', 'x86/vt-d', 'ppc/pamu', 'core' and 'x86/amd' into next
2016-05-09 19:39:17 +02:00
PCI: Identify Enhanced Allocation (EA) BAR Equivalent resources in sysfs
2016-05-16 15:12:02 -05:00
net: l3mdev: Add hook in ip and ipv6
2016-05-11 19:31:40 -04:00
genirq: Allow the affinity of a percpu interrupt to be set/retrieved
2016-05-02 13:42:51 +02:00
irqbypass: Disallow NULL token
2016-05-11 22:37:54 +02:00
genirq: Allow the affinity of a percpu interrupt to be set/retrieved
2016-05-02 13:42:51 +02:00
irqdomain: Allow domain matching on irq_fwspec
2016-05-02 13:42:50 +02:00
isa: Dummy isa_register_driver should return error code
2016-06-17 20:47:11 -07:00
ibft: Expose iBFT acpi header via sysfs
2016-05-16 11:14:29 -04:00
jbd2: remove excess descriptions for handle_s
2016-05-05 22:35:54 -04:00
locking/static_key: Fix concurrent static_key_slow_inc()
2016-06-24 08:23:16 +02:00
mm/kasan: add API to check memory regions
2016-05-20 17:58:30 -07:00
mm: mempool: kasan: don't poot mempool objects in quarantine
2016-06-24 17:23:52 -07:00
Staging and IIO driver update for 4.7-rc1
2016-05-20 22:20:48 -07:00
driver core update for 4.7-rc1
2016-05-20 21:26:15 -07:00
s390/kexec: consolidate crash_map/unmap_reserved_pages() and arch_kexec_protect(unprotect)_crashkres()
2016-05-23 17:04:14 -07:00
KVM: Create debugfs dir and stat files for each VM
2016-05-25 16:12:05 +02:00
leds: core: Fix brightness setting upon hardware blinking enabled
2016-06-08 11:47:06 +02:00
libata: support host-aware and host-managed ZAC devices
2016-05-09 12:36:46 -04:00
nfit, libnvdimm: clarify "commands" vs "_DSMs"
2016-04-28 16:23:16 -07:00
lightnvm: reserved space calculation incorrect
2016-05-06 12:51:10 -06:00
Merge branches 'for-4.7/core', 'for-4.7/livepatching-doc' and 'for-4.7/livepatching-ppc64' into for-linus
2016-05-17 12:06:35 +02:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-05-16 14:47:16 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2016-05-19 09:21:36 -07:00
mcb: export bus information via sysfs
2016-05-03 15:07:35 -07:00
mm: memcontrol: fix cgroup creation failure after many small jobs
2016-07-23 10:25:54 +09:00
mm: fix section mismatch warning
2016-05-27 15:23:32 -07:00
tmpfs: preliminary minor tidyups
2016-05-19 19:12:14 -07:00
include/linux: apply __malloc attribute
2016-05-19 19:12:14 -07:00
Revert "mm: make faultaround produce old ptes"
2016-06-24 17:23:52 -07:00
mm: update_lru_size do the __mod_zone_page_state
2016-05-19 19:12:14 -07:00
mm: oom_reaper: remove some bloat
2016-05-26 15:35:44 -07:00
sched/core: Add switch_mm_irqs_off() and use it in the scheduler
2016-04-28 11:44:19 +02:00
mm fix commmets: if SPARSEMEM, pgdata doesn't have page_ext
2016-05-20 17:58:30 -07:00
devpts: Make each mount of devpts an independent filesystem.
2016-06-05 10:36:01 -07:00
net: Don't forget pr_fmt on net_dbg_ratelimited for CONFIG_DYNAMIC_DEBUG
2016-06-15 22:07:57 -07:00
net: define gso types for IPx over IPv4 and IPv6
2016-05-20 18:03:15 -04:00
vlan: use a valid default mtu value for vlan over macsec
2016-07-16 20:15:02 -07:00
pnfs: rework LAYOUTGET retry handling
2016-05-17 15:48:12 -04:00
Merge branch 'work.preadv2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-05-17 15:05:23 -07:00
NFS: Add COPY nfs operation
2016-05-17 15:47:55 -04:00
NFS client updates for Linux 4.7
2016-05-26 10:33:33 -07:00
nilfs2: fix block comments
2016-05-23 17:04:14 -07:00
ieee802154: use nla_put_u64_64bit()
2016-04-25 15:09:11 -04:00
include/linux/nodemask.h: create next_node_in() helper
2016-05-19 19:12:14 -07:00
NVMe: correct comment for offset enum of controller registers in nvme.h
2016-05-02 09:13:35 -06:00
nvmem: core: remove regmap dependency
2016-05-01 14:01:00 -07:00
of: add missing const for of_parse_phandle_with_args() in !CONFIG_OF
2016-06-03 07:27:55 -05:00
PCI, of: Move PCI I/O space management to PCI core code
2016-05-12 07:07:42 -05:00
drivers/of: Return allocated memory from of_fdt_unflatten_tree()
2016-05-16 07:22:35 -05:00
of: include errno.h in of_graph.h
2016-05-02 09:00:56 -05:00
iommu: of: enforce const-ness of struct iommu_ops
2016-05-09 15:33:29 +02:00
drivers: of: Fix of_pci.h header guard
2016-06-08 08:18:06 -05:00
drivers: of: add definition of early_init_dt_alloc_reserved_memory_arch
2016-06-09 14:38:22 -05:00
mailbox/omap: kill omap_mbox_{save/restore}_ctx() functions
2016-04-26 10:19:38 +05:30
signal: make oom_flags a bool
2016-05-23 17:04:14 -07:00
kernel/padata.c: removed unused code
2016-05-19 19:12:14 -07:00
mm: use unsigned long constant for page flags
2016-05-20 17:58:30 -07:00
mm: check the return value of lookup_page_ext for all call sites
2016-06-03 15:06:22 -07:00
mm: rename _count, field of the struct page, to _refcount
2016-05-19 19:12:14 -07:00
mm: tighten fault_in_pages_writeable()
2016-05-20 17:58:30 -07:00
PCI changes for the v4.7 merge window:
2016-05-19 13:10:54 -07:00
PCI: Add Downstream Port Containment portdrv service type
2016-05-03 10:35:49 -05:00
printk/nmi: generic solution for safe printk in NMI
2016-05-20 17:58:30 -07:00
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2016-05-25 17:05:40 -07:00
net: phy: add phy_ethtool_{get|set}_link_ksettings
2016-05-10 15:06:19 -04:00
PM / OPP: add non-OF versions of dev_pm_opp_{cpumask_, }remove_table
2016-05-05 01:38:44 +02:00
fs: poll/select/recvmmsg: use timespec64 for timeout events
2016-05-19 19:12:14 -07:00
posix_acl: de-union a_refcount and a_rcu
2016-07-11 13:48:02 -04:00
printk/nmi: flush NMI messages on the system panic
2016-05-20 17:58:30 -07:00
drivers: firmware: psci: make two helper functions static
2016-04-25 23:47:44 +02:00
pwm: Fix pwm_apply_args()
2016-06-23 18:37:05 +02:00
radix-tree: fix radix_tree_iter_retry() for tagged iterators.
2016-07-23 10:25:54 +09:00
lib/uuid.c: move generate_random_uuid() to uuid.c
2016-05-20 17:58:30 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-04-23 18:51:33 -04:00
remoteproc: Add additional crash reasons
2016-05-12 15:50:19 -07:00
reservation: add headerdoc comments
2016-05-31 22:12:43 +05:30
reset: TRIVIAL: Add line break at same place for similar APIs
2016-06-29 21:24:53 +02:00
mm: thp: refix false positive BUG in page_move_anon_rmap()
2016-07-15 14:54:27 +09:00
rpmsg: add helper macro module_rpmsg_driver
2016-05-06 11:09:00 -07:00
add down_write_killable_nested()
2016-05-26 00:04:58 -04:00
Clarify naming of thread info/stack allocators
2016-06-24 15:09:37 -07:00
sctp: sctp_diag should dump sctp socket type
2016-05-31 11:59:06 -07:00
Merge branch 'work.const-path' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2016-05-17 14:41:03 -07:00
tty: vt, use proper type for default colors
2016-04-30 09:26:55 -07:00
locking/seqcount: Re-fix raw_read_seqcount_latch()
2016-06-03 08:37:25 +02:00
serial: 8250: export get_mctrl function
2016-04-30 09:26:55 -07:00
serial: 8250: export get_mctrl function
2016-04-30 09:26:55 -07:00
signal: move the "sig < SIGRTMIN" check into siginmask(sig)
2016-05-23 17:04:14 -07:00
net_sched: fix mirrored packets checksum
2016-07-01 16:19:34 -04:00
include/linux: apply __malloc attribute
2016-05-19 19:12:14 -07:00
mm: SLAB freelist randomization
2016-05-19 19:12:14 -07:00
mm: slub: remove unused virt_to_obj()
2016-05-26 15:35:44 -07:00
sock_diag: do not broadcast raw socket destruction
2016-06-28 09:08:51 -04:00
net: Add Qualcomm IPC router
2016-05-08 23:46:14 -04:00
stm class: Support devices that override software assigned masters
2016-05-03 14:59:30 -07:00
include/linux: apply __malloc attribute
2016-05-19 19:12:14 -07:00
fs/namei.c: Add hashlen_string() function
2016-05-28 15:42:50 -04:00
mm, oom: rework oom detection
2016-05-20 17:58:30 -07:00
dma-buf/sync_file: de-stage sync_file headers
2016-04-29 17:37:10 -07:00
include/linux/syscalls.h: use pid_t instead of int
2016-05-20 17:58:30 -07:00
thermal: add the note for set_trip_temp
2016-06-01 22:25:48 +08:00
time: remove timespec_add_safe()
2016-05-19 19:12:14 -07:00
time: Make settimeofday error checking work again
2016-06-01 21:13:43 +02:00
timer: add setup_deferrable_timer macro
2016-05-06 10:42:29 +02:00
This includes two new updates for the ftrace infrastructure.
2016-05-18 18:55:19 -07:00
TTY and Serial driver update for 4.7-rc1
2016-05-20 20:57:27 -07:00
devpts: more pty driver interface cleanups
2016-04-26 15:47:32 -07:00
signal: make oom_flags a bool
2016-05-23 17:04:14 -07:00
tcp: fix lockdep splat in tcp_snd_una_update()
2016-05-04 16:55:11 -04:00
USB: leave LPM alone if possible when binding/unbinding interface drivers
2016-05-03 14:32:07 -07:00
lib/uuid.c: remove FSF address
2016-05-20 17:58:30 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2016-05-23 11:48:48 -07:00
mm, page_alloc: inline zone_statistics
2016-05-19 19:12:14 -07:00
switch ->setxattr() to passing dentry and inode separately
2016-05-27 20:09:16 -04:00
zsmalloc: require GFP in zs_malloc()
2016-05-20 17:58:30 -07:00
