Merge branch 'linus' into irq/core

Get the urgent fixes from upstream to avoid conflicts.
2026-11-13 07:31:07 +00:00 · 2015-06-05 22:25:01 +02:00 · 2015-06-05 22:25:01 +02:00 · 9f61f62544
commit 9f61f62544
parent de8d1810fd 086e8ddb56
693 changed files with 7352 additions and 5473 deletions
--- a/include/drm/drm_pciids.h
+++ b/include/drm/drm_pciids.h
--- a/include/linux/blk_types.h
+++ b/include/linux/blk_types.h
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
--- a/include/linux/compiler-gcc.h
+++ b/include/linux/compiler-gcc.h
--- a/include/linux/compiler-intel.h
+++ b/include/linux/compiler-intel.h
--- a/include/linux/compiler.h
+++ b/include/linux/compiler.h
--- a/include/linux/ftrace_event.h
+++ b/include/linux/ftrace_event.h
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
--- a/include/linux/hid-sensor-hub.h
+++ b/include/linux/hid-sensor-hub.h
--- a/include/linux/irqchip/arm-gic.h
+++ b/include/linux/irqchip/arm-gic.h
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
--- a/include/linux/memcontrol.h
+++ b/include/linux/memcontrol.h
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
--- a/include/linux/nilfs2_fs.h
+++ b/include/linux/nilfs2_fs.h
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
--- a/include/linux/platform_data/si5351.h
+++ b/include/linux/platform_data/si5351.h
--- a/include/linux/rhashtable.h
+++ b/include/linux/rhashtable.h
--- a/include/linux/sched/rt.h
+++ b/include/linux/sched/rt.h
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
--- a/include/linux/tcp.h
+++ b/include/linux/tcp.h
--- a/include/linux/tty.h
+++ b/include/linux/tty.h
--- a/include/linux/uidgid.h
+++ b/include/linux/uidgid.h
--- a/include/linux/util_macros.h
+++ b/include/linux/util_macros.h
--- a/include/net/cfg802154.h
+++ b/include/net/cfg802154.h
--- a/include/net/codel.h
+++ b/include/net/codel.h
--- a/include/net/inet_connection_sock.h
+++ b/include/net/inet_connection_sock.h
--- a/include/net/mac80211.h
+++ b/include/net/mac80211.h
--- a/include/net/mac802154.h
+++ b/include/net/mac802154.h
--- a/include/net/tcp.h
+++ b/include/net/tcp.h
--- a/include/rdma/ib_addr.h
+++ b/include/rdma/ib_addr.h
--- a/include/rdma/ib_cm.h
+++ b/include/rdma/ib_cm.h
--- a/include/rdma/iw_portmap.h
+++ b/include/rdma/iw_portmap.h
--- a/include/uapi/linux/inet_diag.h
+++ b/include/uapi/linux/inet_diag.h
--- a/include/uapi/linux/mpls.h
+++ b/include/uapi/linux/mpls.h
--- a/include/uapi/linux/netfilter/nf_conntrack_tcp.h
+++ b/include/uapi/linux/netfilter/nf_conntrack_tcp.h
--- a/include/uapi/linux/rtnetlink.h
+++ b/include/uapi/linux/rtnetlink.h
--- a/include/uapi/linux/tcp.h
+++ b/include/uapi/linux/tcp.h
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
--- a/include/xen/events.h
+++ b/include/xen/events.h
--- a/include/xen/grant_table.h
+++ b/include/xen/grant_table.h
--- a/include/xen/xen-ops.h
+++ b/include/xen/xen-ops.h