linux/arch/ia64
David S. Miller 89b1698c93 Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net
The BTF conflicts were simple overlapping changes.

The virtio_net conflict was an overlap of a fix of statistics counter,
happening alongisde a move over to a bonafide statistics structure
rather than counting value on the stack.

Signed-off-by: David S. Miller <davem@davemloft.net>
2018-08-02 10:55:32 -07:00
..
configs [IA64] refresh arch/ia64/configs/* using "make savedefconfig" 2014-09-23 11:09:29 -07:00
dig License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
hp dma-mapping updates for 4.18: 2018-06-04 10:58:12 -07:00
include Merge ra.kernel.org:/pub/scm/linux/kernel/git/davem/net 2018-08-02 10:55:32 -07:00
kernel mm: make vm_area_alloc() initialize core fields 2018-07-21 15:24:03 -07:00
lib License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
mm ia64: mark special ia64 memory areas anonymous 2018-08-01 09:57:50 -07:00
oprofile License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
pci PCI/MSI: Don't set up INTx if MSI or MSI-X is enabled 2018-03-13 15:03:36 -05:00
scripts ia64: convert unwcheck.py to python3 2018-03-05 14:35:01 -08:00
sn treewide: kzalloc() -> kcalloc() 2018-06-12 16:19:22 -07:00
uv ia64: change to new flag variables 2011-03-17 14:02:56 +01:00
Kconfig ia64: disable CONFIG_PERFMON at least for now 2018-06-11 11:55:04 -07:00
Kconfig.debug License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00
Makefile kbuild: add machine size to CHECKFLAGS 2018-06-01 11:36:58 +09:00
install.sh
module.lds License cleanup: add SPDX GPL-2.0 license identifier to files with no license 2017-11-02 11:10:55 +01:00