diff options
author | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-13 10:37:05 +0000 |
---|---|---|
committer | Natanael Copa <ncopa@alpinelinux.org> | 2013-11-13 15:16:57 +0000 |
commit | 4c960805dbb001fdd1c470d732cd17c1e207ce12 (patch) | |
tree | 30c7b88f872c4872c5bd5b6b749090bd2fb7d9ff | |
parent | 4fb83db8142b3472ec4e2be98be9420c0c8e1060 (diff) | |
download | aports-4c960805dbb001fdd1c470d732cd17c1e207ce12.tar.bz2 aports-4c960805dbb001fdd1c470d732cd17c1e207ce12.tar.xz |
main/linux-grsec: upgrade to 3.10.19
-rw-r--r-- | main/linux-grsec/APKBUILD | 16 | ||||
-rw-r--r-- | main/linux-grsec/grsecurity-2.9.1-3.10.19-unofficial.patch (renamed from main/linux-grsec/grsecurity-2.9.1-3.10.18-unofficial.patch) | 90 |
2 files changed, 53 insertions, 53 deletions
diff --git a/main/linux-grsec/APKBUILD b/main/linux-grsec/APKBUILD index 5e3559ab6e..a8cf687192 100644 --- a/main/linux-grsec/APKBUILD +++ b/main/linux-grsec/APKBUILD @@ -2,12 +2,12 @@ _flavor=grsec pkgname=linux-${_flavor} -pkgver=3.10.18 +pkgver=3.10.19 case $pkgver in *.*.*) _kernver=${pkgver%.*};; *.*) _kernver=${pkgver};; esac -pkgrel=2 +pkgrel=0 pkgdesc="Linux kernel with grsecurity" url=http://grsecurity.net depends="mkinitfs linux-firmware" @@ -152,8 +152,8 @@ dev() { } md5sums="4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz -e39b75595bf61d758087e1ddecd01a12 patch-3.10.18.xz -8b397a34483c0a5209f473049f1c21b8 grsecurity-2.9.1-3.10.18-unofficial.patch +b7f932eecbbf5636ad69add480fa1573 patch-3.10.19.xz +4440f9004d3b62cf9b526d53c02416ad grsecurity-2.9.1-3.10.19-unofficial.patch a16f11b12381efb3bec79b9bfb329836 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch 656ae7b10dd2f18dbfa1011041d08d60 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch aa454ffb96428586447775c21449e284 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch @@ -166,8 +166,8 @@ b3c0153d53e508e03d73b94d15b24a96 sysctl_lxc.patch cb5c938dccbee36cfb8bb7ee3546b8af kernelconfig.x86 daa81b89f18254155ac33c5239abf3a4 kernelconfig.x86_64" sha256sums="df27fa92d27a9c410bfe6c4a89f141638500d7eadcca5cce578954efc2ad3544 linux-3.10.tar.xz -6fe9123444e4803d2bdec0f89a969024813bd54ba9114471589d1326deee8d6f patch-3.10.18.xz -a7ed5e0ffe7efbfbd19596e7b3ba8b2d8703da48d7216b5ccd745d4ba038e480 grsecurity-2.9.1-3.10.18-unofficial.patch +c420b1da0aefe23e4a6953e579374fd377385b6041f967694cf4f828e2f3252e patch-3.10.19.xz +532870eb3c59200b045efb64463bcc544d394410b2aba63ed5c6dbfe9d974e38 grsecurity-2.9.1-3.10.19-unofficial.patch 6af3757ac36a6cd3cda7b0a71b08143726383b19261294a569ad7f4042c72df3 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch dc8e82108615657f1fb9d641efd42255a5761c06edde1b00a41ae0d314d548f0 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch 0985caa0f3ee8ed0959aeaa4214f5f8057ae8e61d50dcae39194912d31e14892 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch @@ -180,8 +180,8 @@ fc613ac466610b866b721c41836fd5bfb2d4b75bceb67972dc6369d7f62ff47e 0006-ipv4-use- 3e6c4101bfb90b6a30173ef81cd0d0bea51d6a995fc045ca67db7fed271d969d kernelconfig.x86 da67ef700372d080bffb12a86f0a16c987dc79e18fdfb1a88d2704660239e5f0 kernelconfig.x86_64" sha512sums="5fb109fcbd59bf3dffc911b853894f0a84afa75151368f783a1252c5ff60c7a1504de216c0012be446df983e2dea400ad8eeed3ce04f24dc61d0ef76c174dc35 linux-3.10.tar.xz -b891e6969a0628f760aebf04e7b4cfd9e93c73fd1f61d9c50a2e3b812bff4f35f2b2a13f88319a106fb6d9929b83bc59384ddb651b17ea158739523ad252575a patch-3.10.18.xz -f89d6f4e696dad5102e9062e027f3c1b91b6ffee52940507305f9b444461e3782800d1753c5b15498d95fb795d5f285d41678144eb9ecbe63eaac7609fd83965 grsecurity-2.9.1-3.10.18-unofficial.patch +6a8bfb124f90f1c8ed27ce3315629601b1b72d4bc8b1d2b776424e56b3a72e4cd03bcebe6cde35223a3beba75ec6d69e949e217504acc611becb7e62aa88f05c patch-3.10.19.xz +015b090eedeb4bcd75025690bab264afddc9e5a54a897f918a8c5f260b5ddf46bd6cbf510e6efdeb26cc5d351e8c5ccb3c921738f315e4ee5153e288b86608cd grsecurity-2.9.1-3.10.19-unofficial.patch 81e78593288e8b0fd2c03ea9fc1450323887707f087e911f172450a122bc9b591ee83394836789730d951aeec13d0b75a64e1c05f04364abf8f80d883ddc4a02 0001-net-inform-NETDEV_CHANGE-callbacks-which-flags-were-.patch 51ecb15b669f6a82940a13a38939116e003bf5dfd24496771c8279e907b72adcc63d607f0340a2940d757e12ddadb7d45c7af78ae311d284935a6296dbcac00c 0002-arp-flush-arp-cache-on-IFF_NOARP-change.patch 57d0a8bd35d19cf657ded58efe24517d2252aec6984040713ba173a34edb5887ececaa2985076bc6a149eaa57639fd98a042c1c2d226ed4ad8dd5ed0e230717e 0003-ipv4-properly-refresh-rtable-entries-on-pmtu-redirec.patch diff --git a/main/linux-grsec/grsecurity-2.9.1-3.10.18-unofficial.patch b/main/linux-grsec/grsecurity-2.9.1-3.10.19-unofficial.patch index 8b707fb747..cf1b0625d0 100644 --- a/main/linux-grsec/grsecurity-2.9.1-3.10.18-unofficial.patch +++ b/main/linux-grsec/grsecurity-2.9.1-3.10.19-unofficial.patch @@ -281,7 +281,7 @@ index 2fe6e76..889ee23 100644 pcd. [PARIDE] diff --git a/Makefile b/Makefile -index 5fb14e5..9d12b9c 100644 +index 83a02f5..8673672 100644 --- a/Makefile +++ b/Makefile @@ -241,8 +241,9 @@ CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \ @@ -19515,7 +19515,7 @@ index 562a76d..a003c0f 100644 .name = "physical x2apic", .probe = x2apic_phys_probe, diff --git a/arch/x86/kernel/apic/x2apic_uv_x.c b/arch/x86/kernel/apic/x2apic_uv_x.c -index 794f6eb..67e1db2 100644 +index b32dbb4..6d66648 100644 --- a/arch/x86/kernel/apic/x2apic_uv_x.c +++ b/arch/x86/kernel/apic/x2apic_uv_x.c @@ -342,7 +342,7 @@ static int uv_probe(void) @@ -38434,7 +38434,7 @@ index ed1334e..ee0dd42 100644 dev = crtc->dev; diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c -index 9cc247f..36aa285 100644 +index 2ab782c..d994a37 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -306,7 +306,7 @@ module_exit(drm_core_exit); @@ -42094,7 +42094,7 @@ index 1c13071..4bb0452 100644 void dm_uevent_add(struct mapped_device *md, struct list_head *elist) diff --git a/drivers/md/md.c b/drivers/md/md.c -index 51f0345..c77810e 100644 +index d78f1ff..952b9c6 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -234,10 +234,10 @@ EXPORT_SYMBOL_GPL(md_trim_bio); @@ -42244,10 +42244,10 @@ index 3e6d115..ffecdeb 100644 /*----------------------------------------------------------------*/ diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c -index 6f48244..7d29145 100644 +index afaa5d4..c139824 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c -@@ -1822,7 +1822,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) +@@ -1823,7 +1823,7 @@ static int fix_sync_read_error(struct r1bio *r1_bio) if (r1_sync_page_io(rdev, sect, s, bio->bi_io_vec[idx].bv_page, READ) != 0) @@ -42256,7 +42256,7 @@ index 6f48244..7d29145 100644 } sectors -= s; sect += s; -@@ -2049,7 +2049,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, +@@ -2050,7 +2050,7 @@ static void fix_read_error(struct r1conf *conf, int read_disk, test_bit(In_sync, &rdev->flags)) { if (r1_sync_page_io(rdev, sect, s, conf->tmppage, READ)) { @@ -42266,10 +42266,10 @@ index 6f48244..7d29145 100644 "md/raid1:%s: read error corrected " "(%d sectors at %llu on %s)\n", diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c -index 081bb33..3c4b287 100644 +index 0add868..372c6ec 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c -@@ -1940,7 +1940,7 @@ static void end_sync_read(struct bio *bio, int error) +@@ -1941,7 +1941,7 @@ static void end_sync_read(struct bio *bio, int error) /* The write handler will notice the lack of * R10BIO_Uptodate and record any errors etc */ @@ -42278,7 +42278,7 @@ index 081bb33..3c4b287 100644 &conf->mirrors[d].rdev->corrected_errors); /* for reconstruct, we always reschedule after a read. -@@ -2298,7 +2298,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) +@@ -2299,7 +2299,7 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) { struct timespec cur_time_mon; unsigned long hours_since_last; @@ -42287,7 +42287,7 @@ index 081bb33..3c4b287 100644 ktime_get_ts(&cur_time_mon); -@@ -2320,9 +2320,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) +@@ -2321,9 +2321,9 @@ static void check_decay_read_errors(struct mddev *mddev, struct md_rdev *rdev) * overflowing the shift of read_errors by hours_since_last. */ if (hours_since_last >= 8 * sizeof(read_errors)) @@ -42299,7 +42299,7 @@ index 081bb33..3c4b287 100644 } static int r10_sync_page_io(struct md_rdev *rdev, sector_t sector, -@@ -2376,8 +2376,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2377,8 +2377,8 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 return; check_decay_read_errors(mddev, rdev); @@ -42310,7 +42310,7 @@ index 081bb33..3c4b287 100644 char b[BDEVNAME_SIZE]; bdevname(rdev->bdev, b); -@@ -2385,7 +2385,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2386,7 +2386,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 "md/raid10:%s: %s: Raid device exceeded " "read_error threshold [cur %d:max %d]\n", mdname(mddev), b, @@ -42319,7 +42319,7 @@ index 081bb33..3c4b287 100644 printk(KERN_NOTICE "md/raid10:%s: %s: Failing raid device\n", mdname(mddev), b); -@@ -2540,7 +2540,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 +@@ -2541,7 +2541,7 @@ static void fix_read_error(struct r10conf *conf, struct mddev *mddev, struct r10 sect + choose_data_offset(r10_bio, rdev)), bdevname(rdev->bdev, b)); @@ -42329,10 +42329,10 @@ index 081bb33..3c4b287 100644 rdev_dec_pending(rdev, mddev); diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c -index a35b846..e295c6d 100644 +index 4bed545..8d22d0b 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c -@@ -1764,21 +1764,21 @@ static void raid5_end_read_request(struct bio * bi, int error) +@@ -1776,21 +1776,21 @@ static void raid5_end_read_request(struct bio * bi, int error) mdname(conf->mddev), STRIPE_SECTORS, (unsigned long long)s, bdevname(rdev->bdev, b)); @@ -42358,7 +42358,7 @@ index a35b846..e295c6d 100644 if (test_bit(R5_ReadRepl, &sh->dev[i].flags)) printk_ratelimited( KERN_WARNING -@@ -1806,7 +1806,7 @@ static void raid5_end_read_request(struct bio * bi, int error) +@@ -1818,7 +1818,7 @@ static void raid5_end_read_request(struct bio * bi, int error) mdname(conf->mddev), (unsigned long long)s, bdn); @@ -46810,7 +46810,7 @@ index f379c7f..e8fc69c 100644 transport_setup_device(&rport->dev); diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c -index c398634..47ccb41 100644 +index 734a29a..6b06e4a 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2923,7 +2923,7 @@ static int sd_probe(struct device *dev) @@ -48498,7 +48498,7 @@ index a9af1b9a..1e08e7f 100644 ret = -EPERM; goto reterr; diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c -index b645c47..a55c182 100644 +index 2d57a00..74d14de 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -25,6 +25,7 @@ @@ -48583,7 +48583,7 @@ index b645c47..a55c182 100644 } static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) -@@ -809,7 +810,7 @@ int __uio_register_device(struct module *owner, +@@ -830,7 +831,7 @@ int __uio_register_device(struct module *owner, idev->owner = owner; idev->info = info; init_waitqueue_head(&idev->wait); @@ -61200,7 +61200,7 @@ index 8c1c96c..a0f9b6d 100644 return -EINVAL; diff --git a/fs/seq_file.c b/fs/seq_file.c -index 774c1eb..b67582a 100644 +index 3dd44db..a7da2f2 100644 --- a/fs/seq_file.c +++ b/fs/seq_file.c @@ -10,6 +10,7 @@ @@ -61257,7 +61257,7 @@ index 774c1eb..b67582a 100644 if (!m->buf) goto Enomem; m->count = 0; -@@ -581,7 +585,7 @@ static void single_stop(struct seq_file *p, void *v) +@@ -583,7 +587,7 @@ static void single_stop(struct seq_file *p, void *v) int single_open(struct file *file, int (*show)(struct seq_file *, void *), void *data) { @@ -80425,7 +80425,7 @@ index f6c2ce5..982c0f9 100644 + return ns_capable_nolog(ns, cap) && kuid_has_mapping(ns, inode->i_uid); +} diff --git a/kernel/cgroup.c b/kernel/cgroup.c -index 2e9b387..61817b1 100644 +index b6b26fa..ae2217e 100644 --- a/kernel/cgroup.c +++ b/kernel/cgroup.c @@ -5398,7 +5398,7 @@ static int cgroup_css_links_read(struct cgroup *cont, @@ -87209,7 +87209,7 @@ index ceb0c7f..b2b8e94 100644 } else { pr_info("soft offline: %#lx: isolation failed: %d, page count %d, type %lx\n", diff --git a/mm/memory.c b/mm/memory.c -index 5a35443..7c0340f 100644 +index 4b60011..80b1cba 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -428,6 +428,7 @@ static inline void free_pmd_range(struct mmu_gather *tlb, pud_t *pud, @@ -87727,7 +87727,7 @@ index 5a35443..7c0340f 100644 } else { if (cow_page) mem_cgroup_uncharge_page(cow_page); -@@ -3752,6 +3955,12 @@ int handle_pte_fault(struct mm_struct *mm, +@@ -3741,6 +3944,12 @@ int handle_pte_fault(struct mm_struct *mm, if (flags & FAULT_FLAG_WRITE) flush_tlb_fix_spurious_fault(vma, address); } @@ -87740,7 +87740,7 @@ index 5a35443..7c0340f 100644 unlock: pte_unmap_unlock(pte, ptl); return 0; -@@ -3768,6 +3977,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3757,6 +3966,10 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, pmd_t *pmd; pte_t *pte; @@ -87751,7 +87751,7 @@ index 5a35443..7c0340f 100644 __set_current_state(TASK_RUNNING); count_vm_event(PGFAULT); -@@ -3779,6 +3992,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, +@@ -3768,6 +3981,34 @@ int handle_mm_fault(struct mm_struct *mm, struct vm_area_struct *vma, if (unlikely(is_vm_hugetlb_page(vma))) return hugetlb_fault(mm, vma, address, flags); @@ -87786,7 +87786,7 @@ index 5a35443..7c0340f 100644 retry: pgd = pgd_offset(mm, address); pud = pud_alloc(mm, pgd, address); -@@ -3877,6 +4118,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) +@@ -3866,6 +4107,23 @@ int __pud_alloc(struct mm_struct *mm, pgd_t *pgd, unsigned long address) spin_unlock(&mm->page_table_lock); return 0; } @@ -87810,7 +87810,7 @@ index 5a35443..7c0340f 100644 #endif /* __PAGETABLE_PUD_FOLDED */ #ifndef __PAGETABLE_PMD_FOLDED -@@ -3907,6 +4165,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) +@@ -3896,6 +4154,30 @@ int __pmd_alloc(struct mm_struct *mm, pud_t *pud, unsigned long address) spin_unlock(&mm->page_table_lock); return 0; } @@ -87841,7 +87841,7 @@ index 5a35443..7c0340f 100644 #endif /* __PAGETABLE_PMD_FOLDED */ #if !defined(__HAVE_ARCH_GATE_AREA) -@@ -3920,7 +4202,7 @@ static int __init gate_vma_init(void) +@@ -3909,7 +4191,7 @@ static int __init gate_vma_init(void) gate_vma.vm_start = FIXADDR_USER_START; gate_vma.vm_end = FIXADDR_USER_END; gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; @@ -87850,7 +87850,7 @@ index 5a35443..7c0340f 100644 return 0; } -@@ -4054,8 +4336,8 @@ out: +@@ -4043,8 +4325,8 @@ out: return ret; } @@ -87861,7 +87861,7 @@ index 5a35443..7c0340f 100644 { resource_size_t phys_addr; unsigned long prot = 0; -@@ -4080,8 +4362,8 @@ int generic_access_phys(struct vm_area_struct *vma, unsigned long addr, +@@ -4070,8 +4352,8 @@ EXPORT_SYMBOL_GPL(generic_access_phys); * Access another process' address space as given in mm. If non-NULL, use the * given task for page fault accounting. */ @@ -87872,7 +87872,7 @@ index 5a35443..7c0340f 100644 { struct vm_area_struct *vma; void *old_buf = buf; -@@ -4089,7 +4371,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, +@@ -4079,7 +4361,7 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, down_read(&mm->mmap_sem); /* ignore errors, just check how much was successfully transferred */ while (len) { @@ -87881,7 +87881,7 @@ index 5a35443..7c0340f 100644 void *maddr; struct page *page = NULL; -@@ -4148,8 +4430,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, +@@ -4138,8 +4420,8 @@ static int __access_remote_vm(struct task_struct *tsk, struct mm_struct *mm, * * The caller must hold a reference on @mm. */ @@ -87892,7 +87892,7 @@ index 5a35443..7c0340f 100644 { return __access_remote_vm(NULL, mm, addr, buf, len, write); } -@@ -4159,11 +4441,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr, +@@ -4149,11 +4431,11 @@ int access_remote_vm(struct mm_struct *mm, unsigned long addr, * Source/target buffer must be kernel space, * Do not walk the page table directly, use get_user_pages */ @@ -87984,7 +87984,7 @@ index 4baf12e..5497066 100644 capable(CAP_SYS_NICE) ? MPOL_MF_MOVE_ALL : MPOL_MF_MOVE); diff --git a/mm/migrate.c b/mm/migrate.c -index 25ca7ca..abe1836 100644 +index bf436c1..f571994 100644 --- a/mm/migrate.c +++ b/mm/migrate.c @@ -1399,8 +1399,7 @@ SYSCALL_DEFINE6(move_pages, pid_t, pid, unsigned long, nr_pages, @@ -89368,7 +89368,7 @@ index 8d25fdc..bfb7626 100644 vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); diff --git a/mm/mprotect.c b/mm/mprotect.c -index 94722a4..e661e29 100644 +index 2bbb648..1658c46 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -23,10 +23,18 @@ @@ -91258,7 +91258,7 @@ index ab1424d..7c5bd5a 100644 mm->unmap_area = arch_unmap_area; } diff --git a/mm/vmalloc.c b/mm/vmalloc.c -index d365724..6cae7c2 100644 +index d456560..3ed6863 100644 --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -59,8 +59,19 @@ static void vunmap_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end) @@ -94961,7 +94961,7 @@ index ab8bd2c..cd2d641 100644 return res; } diff --git a/net/mac80211/cfg.c b/net/mac80211/cfg.c -index ae36f8e..09d42ac 100644 +index 5ab17b8..5b0aae4 100644 --- a/net/mac80211/cfg.c +++ b/net/mac80211/cfg.c @@ -806,7 +806,7 @@ static int ieee80211_set_monitor_channel(struct wiphy *wiphy, @@ -94994,7 +94994,7 @@ index ae36f8e..09d42ac 100644 if (local->use_chanctx) *chandef = local->monitor_chandef; diff --git a/net/mac80211/ieee80211_i.h b/net/mac80211/ieee80211_i.h -index 9ca8e32..48e4a9b 100644 +index 92ef04c..dab37ef3 100644 --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h @@ -28,6 +28,7 @@ @@ -95005,7 +95005,7 @@ index 9ca8e32..48e4a9b 100644 #include "key.h" #include "sta_info.h" #include "debug.h" -@@ -891,7 +892,7 @@ struct ieee80211_local { +@@ -894,7 +895,7 @@ struct ieee80211_local { /* also used to protect ampdu_ac_queue and amdpu_ac_stop_refcnt */ spinlock_t queue_stop_reason_lock; @@ -95170,7 +95170,7 @@ index c97a065..ff61928 100644 return p; diff --git a/net/mac80211/util.c b/net/mac80211/util.c -index 72e6292..e6319eb 100644 +index 5db8eb5..d0319e8 100644 --- a/net/mac80211/util.c +++ b/net/mac80211/util.c @@ -1472,7 +1472,7 @@ int ieee80211_reconfig(struct ieee80211_local *local) @@ -97941,10 +97941,10 @@ index 643764f..6cc0137 100644 -e 's@^#include <linux/compiler.h>@@' \ -e 's/(^|[^a-zA-Z0-9])__packed([^a-zA-Z0-9_]|$)/\1__attribute__((packed))\2/g' \ diff --git a/scripts/link-vmlinux.sh b/scripts/link-vmlinux.sh -index 0149949..d482a0d 100644 +index 32b10f5..0d8d2ee 100644 --- a/scripts/link-vmlinux.sh +++ b/scripts/link-vmlinux.sh -@@ -158,7 +158,7 @@ else +@@ -160,7 +160,7 @@ else fi; # final build of init/ @@ -100392,7 +100392,7 @@ index 7d8803a..559f8d0 100644 list_add(&s->list, &cs4297a_devs); diff --git a/sound/pci/hda/hda_codec.c b/sound/pci/hda/hda_codec.c -index 55108b5..d973e11 100644 +index 31461ba..d700d1a 100644 --- a/sound/pci/hda/hda_codec.c +++ b/sound/pci/hda/hda_codec.c @@ -916,14 +916,10 @@ find_codec_preset(struct hda_codec *codec) |